Revert "Halo: Add master switch to disable Halo [2/2]"

This reverts commit 25b715c4fb0e24ca979e51d8095587d3e6490053.