Partially revert recent change [46486] which breaks processing for regression testing runners. Thanks to Richard W. for finding the problem.