Fixes #23669

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