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