Revert "Removed some commented out old settings"

This reverts commit 42ab8cf7826f80522a1ffad513e0a1d979eb6b5e.