Revert r930451 as per reasons explained in r1001318 (revert for 4.3), yet nothing changed => reverted for 4.4 in r1080092.
Changed paths: