Revert "HALO cleanup"

This reverts commit 8787899bd2a344aea97f8652f0860a3ff77c3204.