Merge "Use the proper sort order for the no-account case."