I introduced this by accident in #6361 when I switched from explicitly
initializing everything to overriding specific config variables.