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

This reverts commit fc546354be44b9a904f2408374c3713e53d13c63.