This reverts commit b1177d39.

Change-Id: Iffbd63d5993633143a81572b223e3c5dd2353206
Reviewed-on: https://go-review.googlesource.com/12581Reviewed-by: Alan Donovan <adonovan@google.com>