This reverts commit 45f510a90868226282a1a5cf5e2193a00ab8ff13. Change-Id: I56d897856c4b71f73686fb038e35229a864f4285