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

This reverts commit 68e9cf16ae79414525c2ee61bebc21258c8d3d34.