Fixes #15598

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