Fixes #3427.
        Part of issue 3424.

R=golang-dev, bradfitz, r
CC=golang-dev
https://golang.org/cl/5959045