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