Fixed wrongly applied fix of MDEV-5957