This reverts commit 54d7de7d.

It was breaking non-amd64 builds.

Change-Id: I22650e922498eeeba3d4fa08bb4ea40a210c8f97
Reviewed-on: https://go-review.googlesource.com/27925Reviewed-by: Keith Randall <khr@golang.org>