Revert "Final part of Halo import"

This reverts commit cdb62f524a179ac42ba8d3672682425367f99c0a.