Fixes #18140.

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