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