This reverts commit d1036a86604da5d5f72bb9531618d959036caf42. Change-Id: I17ad13d477ece20638c9c1a2f72aea7401d335ca