b3fc8206be
This reverts commitsb72eddac61andf8b5706a1f. And fixes T100265. It brings more problems than solutions.