This fixes a bug which incorrectly overrides the
default config when passed with another config.

Changelog: security