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