Revert "Try to fix HALO on Grouper"

This reverts commit 892260cc3850852722dd4e88d00b2d00bc9b9ea9.