This reverts commit 1c405b73. Reason for revert: <INSERT REASONING HERE> Change-Id: I4af7c87d8a8a988c2f1c3dc6662027c6fcd34088