This reverts commit bfa8b6f8.

Reason for revert: This depends on another CL which is not yet submitted.

Change-Id: I50e7594f1473c911a2079fe910849a6694ac6c07
Reviewed-on: https://go-review.googlesource.com/101496Reviewed-by: Cherry Zhang <cherryyz@google.com>