Oops - still resolving metadata folder

MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs

@@ -60,11 +60,6 @@ namespace MediaBrowser.Controller.Resolvers
                 // Ignore any folders containing a file called .ignore
                 resolve = false;
             }
-            else if (args.FileInfo.cFileName.Equals("metadata", StringComparison.OrdinalIgnoreCase))
-            {
-                // Ignore metadata folders
-                resolve = false;
-            }
 
             return resolve;
         }

MediaBrowser.Controller/Resolvers/FolderResolver.cs

@@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Resolvers
         
         protected override Folder Resolve(ItemResolveEventArgs args)
         {
-            if (args.IsDirectory)
+            if (args.IsDirectory && !args.FileInfo.cFileName.Equals("metadata",System.StringComparison.OrdinalIgnoreCase))
             {
                 return new Folder() { PhysicalLocations = args.PhysicalLocations };
             }