Revert to proper sorting of Matches

This partially reverts commit 2ed81e50b6fa1eb38a9fb78d029b34f1332fd286