bring back the original settings

This reverts the most of changes made
at commit 6936c628eca42a51f540d1682c4370bb97015557