Fixes #20834.

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