Revert "HALO fixes"

This reverts commit 1778e42cdc6419c24551af2ed041f92f7cb78c4a.