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

This reverts commit c3431356438392e619b38b599ba0bfd5faef817b.

Signed-off-by: Paul Beeler <sparksco@gmail.com>