This reverts commit fe107a16. Reason for revert: <INSERT REASONING HERE> Change-Id: Id092c473a8300e014ccd4d941afa4afcdbbf48bc