Fixing ZF-7128 (and tests) - it was probably not working anyway