This reverts commit 21f15a3280. Change-Id: I07b978438b09c1a905eb58d2198913d21d552d6d
21f15a3280
8ec7028