Fixes #20830.

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