Revert "rolled back hmh changes"

This reverts commit 2d20810eb8a73784987684843b2b5c0103abe919.