This reverts commit e9a6f9713ca48aab9a6c87e0645cb0a0af946a11. Change-Id: I611d31086d4f02aae5c7021ac92975bd92a59f34