This reverts commit 722876a989fe1c1514dfacecd1b384f8a47c2816 Change-Id: Ia68516058c1095c936fff47a355748ccf23aa902