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

This reverts commit 544091ae54ce6d0df3af7c73c36f8d2c2f57bcd0.