Fixes golang/go#23507

Change-Id: Id39b28f211dfdb6a5464752b8b62e2528b46286b
Reviewed-on: https://go-review.googlesource.com/91315Reviewed-by: David Symonds <dsymonds@golang.org>