Reorder the output to match other versions