Revert "HALO cleanup"

This reverts commit bb394218e61ad39377591a3e3513327b93189dac.