Revert "Fix Halo build"

This reverts commit 0dd7a8606c0f89f30034235bd98ceff7fbae2762.