This reverts commit f7415663. Reason for revert: <INSERT REASONING HERE> BUG: 74073528 Test: Later Change-Id: I503368a5e880c75e66b4e0fb4c153bc95498b9a1