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

This reverts commit 5a729eb0dd49707ec8a659138b58fc9526879f44.

Change-Id: Ie838aa07bd41e663005f304cae8efbad38de97c7