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