Updates golang/go#13557

Change-Id: I95bbb15d9abbbbc4dc6c3a22cd965d8dcef53fb8
Reviewed-on: https://go-review.googlesource.com/17891Reviewed-by: Blake Mizerany <blake.mizerany@gmail.com>