This reverts commit 357850e42bee122c5774d1cdceff4125700171d6. Change-Id: I24827ea66f0bd963510cf852fcdd57b536d3bafb