Fixes #15546.

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