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