This reverts commit 59ff5d37. This fixes --nofork which was broken in 20.04. !110
mentioned in commit e7f411b1