This reverts commit 2aab8b6d.

Let's see later what to do with this problem (if it is a problem at all).