This reverts commit 8b8914b50d36734305d582485fa839b7d04b8872. Change-Id: Ib3ee99257ed10af5f729f3d29af37b5b48a8e139