This reverts commit d46c683f0e13ad9341ba83453835f6658ae5ad15. Change-Id: I7e56760c92bad1d66d4a1f2415328a4d2138de84