Revert "HALO support (2/2)"

Change-Id: I1fa24935d121a0f11594276fd794f5f9dac0d54b