HHH-9255 : Revert HHH-9222 on 4.2 branch