diff --git a/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java b/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java
index 1b6bbaff9a37af35e598bce0a22656bd8a4200a7..0ccf9abaf3205df77b806ff024e0a2de313cedde 100644
--- a/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java
+++ b/core/src/main/java/hudson/matrix/MatrixConfigurationSorter.java
@@ -37,7 +37,8 @@ public abstract class MatrixConfigurationSorter extends AbstractDescribableImpl<
      */
     public abstract String getErrorFormMessage();
 
-    public static List<MatrixConfigurationSorter> all() {
-        return Hudson.getInstance().getExtensionList(MatrixConfigurationSorter.class);
+    @Override
+    public MatrixConfigurationSorterDescriptor getDescriptor() {
+        return (MatrixConfigurationSorterDescriptor)super.getDescriptor();
     }
 }
diff --git a/core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java b/core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff09dd01f585f55126a8c9b2deb0c63de9d7453a
--- /dev/null
+++ b/core/src/main/java/hudson/matrix/MatrixConfigurationSorterDescriptor.java
@@ -0,0 +1,24 @@
+package hudson.matrix;
+
+import hudson.DescriptorExtensionList;
+import hudson.model.Descriptor;
+import jenkins.model.Jenkins;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class MatrixConfigurationSorterDescriptor extends Descriptor<MatrixConfigurationSorter> {
+    protected MatrixConfigurationSorterDescriptor(Class<? extends MatrixConfigurationSorter> clazz) {
+        super(clazz);
+    }
+
+    protected MatrixConfigurationSorterDescriptor() {
+    }
+
+    /**
+     * Returns all the registered {@link AxisDescriptor}s.
+     */
+    public static DescriptorExtensionList<MatrixConfigurationSorter,MatrixConfigurationSorterDescriptor> all() {
+        return Jenkins.getInstance().<MatrixConfigurationSorter,MatrixConfigurationSorterDescriptor>getDescriptorList(MatrixConfigurationSorter.class);
+    }    
+}