Fixes #15424

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