Fixes #7003. R=golang-codereviews, bradfitz CC=golang-codereviews https://golang.org/cl/47780043
Attach a file by drag & drop or click to upload
