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

This reverts commit 2f364f96c18ffdcacf1810ae4ef8a46a793066c4.