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

This reverts commit 549a76c202a115a3e72e31a1762dfa8b65387412.