Fixes #1122.
Thanks to BigBoss1964 for the solution.

R=golang-dev, r2
CC=golang-dev
https://golang.org/cl/2246042