Revert (2/2) All in one Halo integration, fixes and master switch