Fixes #24331

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