This reverts commits b72eddac61 and f8b5706a1f. And fixes T100265. It brings more problems than solutions.
b72eddac61
f8b5706a1f