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