Fixing ZF-7128 which was probably not working anyway