This reverts commit aeb87aea. Reason for revert: <INSERT REASONING HERE> Change-Id: I0d1c2c0409fdc39aa49e8cf4374ccec43ddc15ce