This reverts commit e8ae1ec0.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I168629722af041d95cdd65bb603e949f17cea1f7