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