Fixes #20478.

Change-Id: I739b6f1368889b735944d74be2d16b7e09eb11a2
Reviewed-on: https://go-review.googlesource.com/45998Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>