This reverts commit 0246915f.

Reason for revert: Broke darwin/arm64 builds.

Change-Id: Iead935d345c4776c0f823f4c152e02bdda308401
Reviewed-on: https://go-review.googlesource.com/121375Reviewed-by: Andrew Bonventre <andybons@golang.org>