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