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

This reverts commit 88402a5c8defbee9b4a4c26ef4106f9e66bc16d8.

Change-Id: If492d6005a4b1ed05ff182a35d9e0fe7ba775dc8