Updates golang/go#23122

Change-Id: I2d6769101cdd580901cb08a3027d787fa438d4bc
Reviewed-on: https://go-review.googlesource.com/117975Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>