Remove hotfixes for ZF 2.3.0