diff --git a/core/src/main/java/hudson/lifecycle/ZFSInstaller.java b/core/src/main/java/hudson/lifecycle/ZFSInstaller.java
index 8583b4511f5bf3e139ec4461b4796d31d2c9060c..5fef397c1e98a032368128b770525a18ba895675 100644
--- a/core/src/main/java/hudson/lifecycle/ZFSInstaller.java
+++ b/core/src/main/java/hudson/lifecycle/ZFSInstaller.java
@@ -332,9 +332,10 @@ public class ZFSInstaller extends AdministrativeMonitor implements Serializable
             return;
         }
 
-        if(System.getProperty(ZFSInstaller.class.getName())!=null)
-            // this feature is still being tested, so only activate this during a test
-            monitors.add(new ZFSInstaller());
+        // install the monitor if applicable
+        ZFSInstaller zi = new ZFSInstaller();
+        if(zi.isActivated())
+            monitors.add(zi);
     }
 
     /**