Fixes #8090. LGTM=alex.brainman R=alex.brainman CC=golang-codereviews https://golang.org/cl/154020043
Attach a file by drag & drop or click to upload
