Revert previous commits

Change-Id: Ib3ffa1ee591fcd1c5d4ddfbf0c78640155c3ce5f