8f6c64f607
This reverts commit bda8ba5ed1768ef9bbd5fdf9a9933ef77ed1f94f. For not yet known reasons this caused a regression on the stable branch. Further more it appears not to be needed, as no work depending on it has been backported so far.