HHH-9106: revert HHH-9106 on 4.2 branch