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

This reverts commit a0a85a7abad804d7827c374f971010e0447077a0.