diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java
index 00e279527dd34906660eca59e8ed0c16c0885312..cd0a3387e194add2159f738f99bcff7bd26c5bbf 100644
--- a/core/src/main/java/hudson/matrix/Axis.java
+++ b/core/src/main/java/hudson/matrix/Axis.java
@@ -208,7 +208,7 @@ public class Axis extends AbstractDescribableImpl<Axis> implements Comparable<Ax
      * Returns all the registered {@link AxisDescriptor}s.
      */
     public static DescriptorExtensionList<Axis,AxisDescriptor> all() {
-        return Hudson.getInstance().getDescriptorList(Axis.class);
+        return Hudson.getInstance().<Axis,AxisDescriptor>getDescriptorList(Axis.class);
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/PageDecorator.java b/core/src/main/java/hudson/model/PageDecorator.java
index 2eb28ddb21ef28d0fcab0b90f3315bb212809cda..b6764c1bc29223d29fc32239b760de6642f940b1 100644
--- a/core/src/main/java/hudson/model/PageDecorator.java
+++ b/core/src/main/java/hudson/model/PageDecorator.java
@@ -114,6 +114,6 @@ public abstract class PageDecorator extends Descriptor<PageDecorator> implements
      * Returns all the registered {@link PageDecorator} descriptors.
      */
     public static ExtensionList<PageDecorator> all() {
-        return Hudson.getInstance().getDescriptorList(PageDecorator.class);
+        return Hudson.getInstance().<PageDecorator,PageDecorator>getDescriptorList(PageDecorator.class);
     }
 }
diff --git a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java
index 19be7db5bf7eff0d28929cc29706e05792694a19..933267d7a94350df166cb78cb58d7026b9bd247e 100644
--- a/core/src/main/java/hudson/model/labels/LabelAtomProperty.java
+++ b/core/src/main/java/hudson/model/labels/LabelAtomProperty.java
@@ -60,6 +60,6 @@ public class LabelAtomProperty extends AbstractDescribableImpl<LabelAtomProperty
      * Lists up all the registered {@link LabelAtomPropertyDescriptor}s in the system.
      */
     public static DescriptorExtensionList<LabelAtomProperty,LabelAtomPropertyDescriptor> all() {
-        return Hudson.getInstance().getDescriptorList(LabelAtomProperty.class);
+        return Hudson.getInstance().<LabelAtomProperty,LabelAtomPropertyDescriptor>getDescriptorList(LabelAtomProperty.class);
     }
 }
diff --git a/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java b/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java
index 531e804c1f40588fc2af628eb3d11b83d896752f..7814017bd9977b93ed75f0c68961b2d42ce2d710 100644
--- a/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java
+++ b/core/src/main/java/hudson/slaves/ComputerConnectorDescriptor.java
@@ -12,6 +12,6 @@ import hudson.model.Hudson;
  */
 public abstract class ComputerConnectorDescriptor extends Descriptor<ComputerConnector> {
     public DescriptorExtensionList<ComputerConnector,ComputerConnectorDescriptor> all() {
-        return Hudson.getInstance().getDescriptorList(ComputerConnector.class);
+        return Hudson.getInstance().<ComputerConnector,ComputerConnectorDescriptor>getDescriptorList(ComputerConnector.class);
     }
 }