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

This reverts commit 825e0482bf26b97587b07a596575246f9086ee13.