Bug-22253: Previous changes broke test harness. Reverting output to previous format.