This reverts commit 98c4750f. Reason for revert: broken builds Change-Id: Icd3a9e226ff8ff288b682757cded9f43069ebc5e