HHH-7900 Reverting accidental partial push

This reverts commit 48816a2c8a66f9ac6acba21333533af90db825b7.