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