Revert "Update from original"

Reverts MadCat34/zf2#1