@bcmills requested issue #50810 to be considered for backport to the next 1.16 minor release.

@gopherbot, please backport to Go 1.16 and 1.17. This removes a dependency on an implementation detail of a service external to the Go project.