Revert r930451 (again) As seen in r1001318 for 4.3, this time also reverting in trunk since there was absolutely no improvement.
Changed paths: