Let's add this back: "Halo: Add master switch to disable Halo (2/2)

This reverts commit 048c211305262713f9102067199b8ea6d76a8b7e.