After CL 10296 the workaround from CL 9783 is no longer necessary. Revert the workaround but keep the global reference, just in case. Change-Id: I3fdd580e4122c36508beb9d328739b910dbbe2e2 Reviewed-on: https://go-review.googlesource.com/10483 Reviewed-by: David Crawshaw <crawshaw@golang.org>