Revert "hh: Temp disable a few things in overlay for bringup"

This reverts commit 3259545dd85d2601a391f42a7331230c709755ba.