reverting some of the Changes

Change-Id: I8f7d6a3a9e04c625204ab7e614434f95521aca4b