This reverts commit 5acb77a5.

Reason for revert: broke acloud b/112803893

Change-Id: I60a8e5bcdd1d69fa9cf04ebb01d515a1b833dc1f