HHH-9282 : Revert HHH-9222 on master