Fixes #4259 - changes the default configuration