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