Fixes #6535

Change-Id: I34974c0050424c96d19ad69bf4522bb69cde2fd5
Reviewed-on: https://go-review.googlesource.com/85815Reviewed-by: Ian Lance Taylor <iant@golang.org>