Ok, but maybe that should be another commit to change the functionality. I think it's good to keep this one just for upgrading the config file to the new upstream default.