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