Fixes #3420.
        Part of issue 3424.

R=golang-dev, cldorian, adg, r
CC=golang-dev
https://golang.org/cl/5958046