Merge "Stop enabling g-reg by default"