diff --git a/core/src/main/java/hudson/FileSystemProvisioner.java b/core/src/main/java/hudson/FileSystemProvisioner.java
index 592153548a..4ea664b868 100644
--- a/core/src/main/java/hudson/FileSystemProvisioner.java
+++ b/core/src/main/java/hudson/FileSystemProvisioner.java
@@ -30,8 +30,8 @@ import hudson.model.Computer;
 import hudson.model.Describable;
 import hudson.model.Job;
 import hudson.model.TaskListener;
+import hudson.model.Hudson;
 import hudson.model.listeners.RunListener;
-import hudson.util.DescriptorList;
 import hudson.scm.SCM;
 
 import java.io.BufferedOutputStream;
@@ -170,12 +170,9 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab
      */
     public abstract WorkspaceSnapshot snapshot(AbstractBuild<?,?> build, FilePath ws, TaskListener listener) throws IOException, InterruptedException;
 
-    public abstract FileSystemProvisionerDescriptor getDescriptor();
-
-    /**
-     * A list of available file system provider types.
-     */
-    public static final DescriptorList<FileSystemProvisioner> LIST = new DescriptorList<FileSystemProvisioner>();
+    public FileSystemProvisionerDescriptor getDescriptor() {
+        return (FileSystemProvisionerDescriptor) Hudson.getInstance().getDescriptor(getClass());
+    }
 
     /**
      * Default implementation.
@@ -210,10 +207,6 @@ public abstract class FileSystemProvisioner implements ExtensionPoint, Describab
             return new WorkspaceSnapshotImpl();
         }
 
-        public FileSystemProvisionerDescriptor getDescriptor() {
-            return null;
-        }
-
         public static final class WorkspaceSnapshotImpl extends WorkspaceSnapshot {
             public void restoreTo(AbstractBuild<?,?> owner, FilePath dst, TaskListener listener) throws IOException, InterruptedException {
                 File wss = new File(owner.getRootDir(),"workspace.zip");
diff --git a/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java b/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
index 3aea55660f..9cf7202e9b 100644
--- a/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
+++ b/core/src/main/java/hudson/os/solaris/ZFSProvisioner.java
@@ -98,9 +98,5 @@ public class ZFSProvisioner extends FileSystemProvisioner implements Serializabl
         throw new UnsupportedOperationException();
     }
 
-    public FileSystemProvisionerDescriptor getDescriptor() {
-        return null;
-    }
-
     private static final long serialVersionUID = 1L;
 }