Fix EZP-23351: Regression in wrappers introduced in #1029

Seemed easier to manage to use this w/o php-generator, so removed it.