diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 8a97ddd2fb37f1fd620ce476bafe1d770b2b3072..0b2a4523ae943f6aa714c5a2e08a086f2586e214 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -1351,7 +1351,10 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
 
     public static final PermissionGroup PERMISSIONS = new PermissionGroup(Computer.class,Messages._Computer_Permissions_Title());
     public static final Permission CONFIGURE = new Permission(PERMISSIONS,"Configure", Messages._Computer_ConfigurePermission_Description(), Permission.CONFIGURE, PermissionScope.COMPUTER);
-    public static final Permission EXTENDED_READ = new Permission(PERMISSIONS,"ExtendedRead", Messages._Computer_ExtendedReadPermission_Description(), CONFIGURE, PermissionScope.COMPUTER);
+    /**
+     * @since TODO
+     */
+    public static final Permission EXTENDED_READ = new Permission(PERMISSIONS,"ExtendedRead", Messages._Computer_ExtendedReadPermission_Description(), CONFIGURE, Boolean.getBoolean("hudson.security.ExtendedReadPermission"), new PermissionScope[]{PermissionScope.COMPUTER});
     public static final Permission DELETE = new Permission(PERMISSIONS,"Delete", Messages._Computer_DeletePermission_Description(), Permission.DELETE, PermissionScope.COMPUTER);
     public static final Permission CREATE = new Permission(PERMISSIONS,"Create", Messages._Computer_CreatePermission_Description(), Permission.CREATE, PermissionScope.COMPUTER);
     public static final Permission DISCONNECT = new Permission(PERMISSIONS,"Disconnect", Messages._Computer_DisconnectPermission_Description(), Jenkins.ADMINISTER, PermissionScope.COMPUTER);
diff --git a/test/src/main/java/hudson/cli/CLICommandInvoker.java b/test/src/main/java/hudson/cli/CLICommandInvoker.java
index 85cda1d04b27b3bbf0e646b35e5659e9c769e5cb..76f96868d895f491d8945b43795d5bed9ed3d449 100644
--- a/test/src/main/java/hudson/cli/CLICommandInvoker.java
+++ b/test/src/main/java/hudson/cli/CLICommandInvoker.java
@@ -107,6 +107,7 @@ public class CLICommandInvoker {
 
         GlobalMatrixAuthorizationStrategy auth = new GlobalMatrixAuthorizationStrategy();
         for(Permission p: permissions) {
+            p.setEnabled(true);
             auth.add(p, username);
         }
         rule.jenkins.setAuthorizationStrategy(auth);
diff --git a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java
index 5500506ef3bc51479cf4fc9d24c03cd3e53845a5..e2f17f8d34426818ffb5f59fcce961fd27e209f1 100644
--- a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java
+++ b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java
@@ -107,6 +107,7 @@ public class ComputerConfigDotXmlTest {
 
         GlobalMatrixAuthorizationStrategy auth = new GlobalMatrixAuthorizationStrategy();
         rule.jenkins.setAuthorizationStrategy(auth);
+        Computer.EXTENDED_READ.setEnabled(true);
         auth.add(Computer.EXTENDED_READ, "user");
 
         final OutputStream outputStream = captureOutput();