Revert "Tweak a few settings"

Changes will be made individually, with more thorough testing

This reverts commit ad5e2e1967e172dc144daf45fc4b91e617499c75.