Fixes #16980

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