Revert "HALO cleanup"

This reverts commit 369f9bf520a76a0fd67bd0dc4709dc153c481c20.