Revert "Experiment with test fork mode once"

This reverts commit afac62056d3bd842e1bc3c94b0b01066aee5bf1d.