This reverts commit 78ce40093ac008fd6d169ab83d2d5961f91f6e31. Change-Id: I8482f550c30f75d65333f6be9c9115a930abc56f