diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 31d80b0dae..9df9848cc7 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -456,7 +456,7 @@ public class Functions {
         for (Descriptor<T> b : list) {
             if (b instanceof BuildStepDescriptor) {
                 BuildStepDescriptor bsd = (BuildStepDescriptor) b;
-                if(bsd.isApplicable(project))
+                if(bsd.isApplicable(project.getClass()))
                     result.add(b);
             } else {
                 // old plugins built before 1.150 may not implement BuildStepDescriptor
diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
index 9da5fb1af7..58da33163e 100644
--- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
+++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java
@@ -24,5 +24,5 @@ public abstract class BuildStepDescriptor<T extends BuildStep & Describable<T>>
      * @return
      *      true to allow user to configure this post-promotion task for the given project.
      */
-    public abstract boolean isApplicable(AbstractProject<?,?> item);
+    public abstract boolean isApplicable(Class<? extends AbstractProject> jobType);
 }
diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java
index dba668a7ef..e4468a6979 100644
--- a/core/src/main/java/hudson/tasks/BuildTrigger.java
+++ b/core/src/main/java/hudson/tasks/BuildTrigger.java
@@ -188,7 +188,8 @@ public class BuildTrigger extends Publisher {
                 formData.getBoolean("evenIfUnstable"));
         }
 
-        public boolean isApplicable(AbstractProject<?,?> item) {
+        @Override
+        public boolean isApplicable(Class<? extends AbstractProject> jobType) {
             return true;
         }