Revert "Revert "remofhr""

This reverts commit b5d10829d79fe5dfcfb15a34d99e31a91b18fd44.