This reverts commit 818719dd. Reason for revert: <INSERT REASONING HERE> Change-Id: I595c1949ed139700144f19ee5bd7f91a5f0a1edd