Revert-and-redo r255955: the sort -r should be added to delete-old-dirs.

Approved by:	re (gjb)