This reverts commit b1b4f671.

Reason for revert: Broke the build.

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