diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
index 8f5623d..c334306 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
@@ -27,7 +27,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.zip.CRC32;
 
 /**
@@ -104,7 +103,7 @@
         {
             return null;
         }
-        Set/*<File>*/ files = new TreeSet/*<File>*/(new FileModificationTimeComparator());
+        Set/*<File>*/ files = new HashSet/*<File>*/();
         Set/*<File>*/ removed = new HashSet/*<File>*/(storedChecksums.keySet());
         for (int i = 0; i < list.length; i++)
         {
@@ -201,18 +200,4 @@
         }
     }
 
-    /**
-     * {@link Comparator} that sorts {@link File}s in increasing order of modification time
-     * ("oldest first").
-     */
-    private final static class FileModificationTimeComparator implements Comparator
-    {
-        public int compare(Object arg0, Object arg1)
-        {
-            File lhs = (File) arg0;
-            File rhs = (File) arg1;
-            return (int) (lhs.lastModified() - rhs.lastModified());
-        }
-    }
-
 }
