Revert "HALO fixes"

This reverts commit 369ba2ab2772cf67f8f52b239536efe8f2a357af.