Fixes #15225

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