Fix config for backward compatibility with #17785