Revert to original handling of default config options