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