Index: Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs
===================================================================
--- Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs	(revision 5018)
+++ Core/Banshee.Services/Banshee.Metadata.FileSystem/FileSystemQueryJob.cs	(working copy)
@@ -41,11 +41,9 @@
 {
     public class FileSystemQueryJob : MetadataServiceJob
     {
-        private TrackInfo track;
         public FileSystemQueryJob (IBasicTrackInfo track)
         {
             Track = track;
-            this.track = track as TrackInfo;
         }
         
         public override void Run ()
@@ -72,29 +70,13 @@
             // Get the largest (in terms of file size) JPEG in the directory
             long max_size = 0;
             string best_file = null;
-            int items_in_directory = 0;
-            bool found_definite_best = false;
-            int max_acceptable_items = Math.Max (30, track.TrackCount + 8);
             foreach (string file in Banshee.IO.Directory.GetFiles (directory)) {
-                // Ignore directories with tons of songs in them; this lookup is only intended for when the
-                // music file is in a directory specific to its album.
-                if (++items_in_directory > max_acceptable_items) {
-                    if (best_file != null) {
-                        Log.Debug ("Ignoring image file in folder because too many files in folder", directory);
-                    }
-                    return;
-                }
-                
-                if (found_definite_best) {
-                    continue;
-                }
-                
                 string extension = System.IO.Path.GetExtension (file).ToLower ();
                 if (Array.IndexOf (extensions, extension) != -1) {
                     string filename = System.IO.Path.GetFileNameWithoutExtension (file).ToLower ();
                     if (Array.IndexOf (filenames, filename) != -1) {
                         best_file = file;
-                        found_definite_best = true;
+                        break;
                     } else {
                         long size = Banshee.IO.File.GetSize (new SafeUri (file));
                         if (size > max_size) {
