Revert HALO stuff, squashed commit

This reverts commit 8be65f90dbd1c44ce50c36eaf2eda96aaa004f28.

Change-Id: I43bb3b4b65e8024d5b8afc701615394c2ebc2999
Rework HALO, squashed commit

Change-Id: Iabf4368601af647e33da5557a35e332eff64ac57