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