Fixes #6324. R=golang-dev, iant, mikioh.mikioh CC=golang-dev https://golang.org/cl/13280049
Attach a file by drag & drop or click to upload
