HHH-8149 Revert HHH-7797 in 4.1.x