Config "salvation" :-)

Let's just create a PR for this. Actually, I have a rivalling change in a second checkout that I need to marry with this, first...