Maybe this is a good idea. Also add an option to disable it again, for the sake of testing. Fixes #2502.