Updates golang/go#20672

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