Revert "set conditional config settings"

This reverts commit 1b86aadec2adec4b2d2f93f7de2b67fb15487f76.