Fixes #6441. R=r CC=andybons, golang-dev https://golang.org/cl/13829043
Attach a file by drag & drop or click to upload
