diff --git a/src/Orchard/Environment/Extensions/IExtensionManager.cs b/src/Orchard/Environment/Extensions/IExtensionManager.cs
index 723a82cd0..b79f0b95c 100644
--- a/src/Orchard/Environment/Extensions/IExtensionManager.cs
+++ b/src/Orchard/Environment/Extensions/IExtensionManager.cs
@@ -15,13 +15,7 @@ namespace Orchard.Environment.Extensions {
 
     public static class ExtensionManagerExtensions {
         public static IEnumerable<FeatureDescriptor> EnabledFeatures(this IExtensionManager extensionManager, ShellDescriptor descriptor) {
-            return extensionManager.AvailableExtensions()
-                .SelectMany(extensionDescriptor => extensionDescriptor.Features)
-                .Where(featureDescriptor => IsFeatureEnabledInDescriptor(featureDescriptor, descriptor));
-        }
-
-        private static bool IsFeatureEnabledInDescriptor(FeatureDescriptor featureDescriptor, ShellDescriptor shellDescriptor) {
-            return shellDescriptor.Features.Any(shellDescriptorFeature => shellDescriptorFeature.Name == featureDescriptor.Id);
+            return extensionManager.AvailableFeatures().Where(fd => descriptor.Features.Any(sf => sf.Name == fd.Id));
         }
     }
 }