Fixes #1743. (Actually was fixed earlier, but now we have proof.) R=ken2 CC=golang-dev https://golang.org/cl/5649064