bug 5748: back out revs 607229 and 606874, and do much simpler fix of removing unnecessary sort
bug 5748: back out revs 607229 and 606874, and do much simpler fix of removing unnecessary sort

git-svn-id: e9fe9b84e32fc5e57b7d09c40cd78b14ea28ed71@607728 13f79535-47bb-0310-9956-ffa450edef68

apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin