Merge "Revert "Revert "Stop enabling g-reg by default"""