Partially reverts ac26cc1cb0. The configurability introduced there is still available, so people can easily disable this, if necessary.
ac26cc1cb0