Revert "Halo: Add master switch to disable Halo (1/2)"

This reverts commit 0de7897e53225abe05f8f6873da522f86c83fcb5.