This reverts commit 5b0c3677 which was wrong and fortunately did not survive the upcoming memcheck tests.