This reverts commit 08a04c1524. This also reverts commit 5bcbf857d1. Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
08a04c1524
5bcbf857d1