Revert "Fix Halo conflict"

This reverts commit 93dd6e201a4b404e2342a141792462e2cc1dd3d5.