73515a7c74
This reverts commit 47d1947338.
Oops, incorrect testing of the changes. This change causes even uglier
Evolution, thus rather revert it.