Reverted wrong commit
Xinchen, stop commit changed configs :)
You may use environment variables to ovverride default settings