This reverts commit 1c04bff0d66b85cbdb74fa9ceaec6f1fa9f7ead4. Change-Id: I097b1cbeed3beedec3f64260676641244b22a2ea