This reverts commit 2400b2c340. Change-Id: I7f6823385448db5f94cdfc4df8cdf32ab9d156c2
2400b2c340
96cd9c31