Unbreak the no-config-file case after last commit