ZF-11161 Backing out r23905 from trunk, this will need a more complex/detailed fix
ZF-11161
Backing out r23905 from trunk, this will need a more complex/detailed fix


svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework,svenax/ZendFramework