This reverts commit cca2a91a7cba2f0005b9d4a9a21a506ed191c348. Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46