Updates golang/go#22927

Change-Id: I813b9ba92f9dd7e517385dc95df20691efee01a6
Reviewed-on: https://go-review.googlesource.com/80755Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>