This reverts commit 82dc1a6343. Reason for revert: <INSERT REASONING HERE> Change-Id: I8954b37c354382804a139d80e2551c381fd9b2ed
82dc1a6343