Revert [ZF-6711] changes (should be reopened). Closes [ZF-6725].
Revert [ZF-6711] changes (should be reopened). Closes [ZF-6725].

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

MadCat34/zend-filter,Maks3w/zend-filter,delboy1978uk/zend-filter,zendframework/zend-filter