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