change back to original settings

Change-Id: Ic636f2797bbb4f29c46a9b36930b467a33a1a611