Revert "HHH-7919 : Miscellaneous bugfixes"

This reverts commit 025c2f4f67a9b1794f83e3ebc300ddcda68a15b5.