This reverts commit d98a4e50. Merged-In: Ibd1596584928f2aa2c799501536abc9b384d1cda Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda