Fixes #9308

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