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

This reverts commit 3a503e7affdcd6b9425cc28e6d1873babcb74330.