This reverts commit 863efacc. Reason for revert: <INSERT REASONING HERE> Change-Id: I3d9efef938fe0a2ec4914adc23d0e53b873109d4