This reverts commit 9a2d2a45. Reason for revert: <INSERT REASONING HERE> Change-Id: I1b96d1111b993ca23061844dd33573c16d449248