Cherry pick from fca2125702: Last of the globals for now