Revert "Remove unneeded Halo option"

This reverts commit c8a4d7a768650ed049b016d9707ddf6eb95d49eb.

Change-Id: Iacf168cb0b39b32bd99d156848b5895708014c45