Revert unnecessary changes

Change-Id: Iba5cdae8b3d0ab5eebf1b4ad64baf6a35438ade9