Fixes #16230

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