This reverts commit 437a8511. The outcome of this isn't that clear, let's revert this for now, see discussion on #6286.