This reverts commit 4eea887f.

Reason for revert: broke s390x build

Change-Id: Id6c2b6a7319273c4d21f613d4cdd38b00d49f847
Reviewed-on: https://go-review.googlesource.com/100375Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>