This reverts commit 1f48b58b. which is reported to cause extreme slowness in kmail, until we understand why. BUG: 317569