Back to normal settings

Change-Id: I6dcefe2cc8b52ad7a4976c39297a75948684a149