Fixes #7701. (again, differently) LGTM=rsc R=iant, rsc CC=golang-codereviews https://golang.org/cl/94560043
Attach a file by drag & drop or click to upload
