Revert r1377398 (bug fix for PR 53693), which results in more processes being used. This needs more careful analysis and modification before release. Also revert r1397778 (PR 54000) and r1527358, which addressed issues with r1377398.