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

This reverts commit 36d382c05e9ab46098b2d2817ab751a5632b0dd8.