This reverts commit a9e6dc57237d8b8f3631c80422a249bbafb2672c. Change-Id: I16e6e6364cea16fa7b3d787aad189412d5d1320d