Fixes #8780

Change-Id: I09cf01ff9722eed49086992a12774f2de81d16f2
Reviewed-on: https://go-review.googlesource.com/2840Reviewed-by: Andrew Gerrand <adg@golang.org>