This reverts commit 56350fe387. Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52
56350fe387
70f6dea9