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


git-svn-id: abaeb2b3ba5a94ed391a9405ad7d63d0414021c9@23980 44c647ce-9c0f-0410-b52a-842ac1e357ba

ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1,ajgarlag/zf1