This reverts commit fb1ef044.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I53e5a42df0f2a7796c5c0b1296b7c31134b38ba7