This reverts commit 2e2f0414. Reason for revert: <INSERT REASONING HERE> Change-Id: I7a8b105cd025edc6dec84da1a9715718fe96e107