re-re-re-backport the config changes from 2.0