This reverts commit e3d186cb262b0ae66ecb8edcfbb6eb37582ccaad. Change-Id: Ifb33a20060fae53c39309e5678f1febb5374d425