Fixes golang/go#16185 Change-Id: Ic7d64428b39be6b39a965fddf8753a2ce36d262c Reviewed-on: https://go-review.googlesource.com/24482 Reviewed-by: Andrew Gerrand <adg@golang.org> Reviewed-by: David Crawshaw <crawshaw@golang.org>