Revert for Halo 2.0 merge