This reverts commit 42ddc18d10. Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
42ddc18d10
1a4527ce