This reverts commit 59ff5d37. This fixes --nofork which was broken in 20.04. !110 (cherry picked from commit 604691df)