Revert "Halo conflict fix"

This reverts commit ccf67cb65fc8d2e7695360006a0ea03562e86528.