Revert "Latest Changes for HH"

This reverts commit d4ca181ad078d012d95177804474bd57d52343bb.