Fixes #7886. LGTM=iant, r, rsc R=r, iant, rsc, ken CC=golang-codereviews https://golang.org/cl/149010043
Attach a file by drag & drop or click to upload
