This reverts commit dc9ca02c51ecc4468e60c391f8357b5025d6eef1. Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752