diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 2b7775c304..c8674fb028 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -887,7 +887,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                 e.buildEnvVars(env);
 
         for (EnvironmentContributingAction a : getActions(EnvironmentContributingAction.class))
-            a.buildEnvVars(this,env,getBuiltOn());
+            a.buildEnvVars(this,env);
 
         EnvVars.resolve(env);
 
diff --git a/core/src/main/java/hudson/model/EnvironmentContributingAction.java b/core/src/main/java/hudson/model/EnvironmentContributingAction.java
index 55f5035965..03ad23fb35 100644
--- a/core/src/main/java/hudson/model/EnvironmentContributingAction.java
+++ b/core/src/main/java/hudson/model/EnvironmentContributingAction.java
@@ -31,7 +31,6 @@ import hudson.tasks.BuildWrapper;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.ProtectedExternally;
 
-import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -46,23 +45,20 @@ import javax.annotation.Nonnull;
  *
  * @author Kohsuke Kawaguchi
  * @since 1.318
- * @see AbstractBuild#getEnvironment(TaskListener)
+ * @see Run#getEnvironment(TaskListener)
  * @see BuildWrapper
  */
 public interface EnvironmentContributingAction extends Action {
     /**
-     * Called by {@link Run} or {@link AbstractBuild} to allow plugins to contribute environment variables.
+     * Called by {@link Run} to allow plugins to contribute environment variables.
      *
      * @param run
      *      The calling build. Never null.
-     * @param node
-     *      The node execute on. Can be {@code null} when the Run is not binded to the node,
-     *      e.g. in Pipeline outside the {@code node() step}
      * @param env
      *      Environment variables should be added to this map.
-     * @since TODO
+     * @since 2.76
      */
-    default void buildEnvVars(@Nonnull Run<?, ?> run, @Nonnull EnvVars env, @CheckForNull Node node) {
+    default void buildEnvironment(@Nonnull Run<?, ?> run, @Nonnull EnvVars env) {
         if (run instanceof AbstractBuild
                 && Util.isOverridden(EnvironmentContributingAction.class,
                                      getClass(), "buildEnvVars", AbstractBuild.class, EnvVars.class)) {
@@ -73,7 +69,7 @@ public interface EnvironmentContributingAction extends Action {
     /**
      * Called by {@link AbstractBuild} to allow plugins to contribute environment variables.
      *
-     * @deprecated Use {@link #buildEnvVars(Run, EnvVars, Node)} instead
+     * @deprecated Use {@link #buildEnvironment} instead
      *
      * @param build
      *      The calling build. Never null.
@@ -84,8 +80,8 @@ public interface EnvironmentContributingAction extends Action {
     @Restricted(ProtectedExternally.class)
     default void buildEnvVars(AbstractBuild<?, ?> build, EnvVars env) {
         if (Util.isOverridden(EnvironmentContributingAction.class,
-                              getClass(), "buildEnvVars", Run.class, EnvVars.class, Node.class)) {
-            buildEnvVars(build, env, build.getBuiltOn());
+                              getClass(), "buildEnvironment", Run.class, EnvVars.class)) {
+            buildEnvironment(build, env);
         }
     }
 }
diff --git a/core/src/main/java/hudson/model/ParametersAction.java b/core/src/main/java/hudson/model/ParametersAction.java
index 86e687b17f..60db6822d7 100644
--- a/core/src/main/java/hudson/model/ParametersAction.java
+++ b/core/src/main/java/hudson/model/ParametersAction.java
@@ -139,7 +139,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
     }
 
     @Override
-    public void buildEnvVars(Run<?,?> run, EnvVars env, Node node) {
+    public void buildEnvironment(Run<?,?> run, EnvVars env) {
         for (ParameterValue p : getParameters()) {
             if (p == null) continue;
             p.buildEnvironment(run, env);
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 46970882a2..9d9b7f4cd2 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -2301,8 +2301,11 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
         for (EnvironmentContributor ec : EnvironmentContributor.all().reverseView())
             ec.buildEnvironmentFor(this,env,listener);
 
-        for (EnvironmentContributingAction a : getActions(EnvironmentContributingAction.class))
-            a.buildEnvVars(this,env,n);
+        if (!(this instanceof AbstractBuild)) {
+            for (EnvironmentContributingAction a : getActions(EnvironmentContributingAction.class)) {
+                a.buildEnvironment(this, env);
+            }
+        } // else for compatibility reasons, handled in override after buildEnvironments
 
         return env;
     }
diff --git a/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java b/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java
index 29ce962aec..3794a6bf24 100644
--- a/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java
+++ b/core/src/test/java/hudson/model/EnvironmentContributingActionTest.java
@@ -3,7 +3,6 @@ package hudson.model;
 import hudson.EnvVars;
 import org.junit.Test;
 
-import javax.annotation.CheckForNull;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
@@ -16,7 +15,7 @@ public class EnvironmentContributingActionTest {
         private boolean wasCalled = false;
 
         @Override
-        public void buildEnvVars(Run<?, ?> run, EnvVars env, @CheckForNull Node node) {
+        public void buildEnvironment(Run<?, ?> run, EnvVars env) {
             wasCalled = true;
         }
 
@@ -50,7 +49,7 @@ public class EnvironmentContributingActionTest {
         }
 
         @Override
-        public void buildEnvVars(Run<?, ?> run, EnvVars env, @CheckForNull Node node) {
+        public void buildEnvironment(Run<?, ?> run, EnvVars env) {
             wasCalledRun = true;
         }
 
@@ -71,7 +70,7 @@ public class EnvironmentContributingActionTest {
         Node node = mock(Node.class);
 
         OverrideRun overrideRun = new OverrideRun();
-        overrideRun.buildEnvVars(run, envVars, node);
+        overrideRun.buildEnvironment(run, envVars);
 
         assertTrue(overrideRun.wasNewMethodCalled());
     }
@@ -99,10 +98,9 @@ public class EnvironmentContributingActionTest {
     @Test
     public void testOverrideAbstractBuildAndCallNewMethodWithAbstractBuild() throws Exception {
         AbstractBuild abstractBuild = mock(AbstractBuild.class);
-        Node node = mock(Node.class);
 
         OverrideAbstractBuild action = new OverrideAbstractBuild();
-        action.buildEnvVars(abstractBuild, envVars, node);
+        action.buildEnvironment(abstractBuild, envVars);
 
         assertTrue(action.wasDeprecatedMethodCalled());
     }
@@ -114,10 +112,9 @@ public class EnvironmentContributingActionTest {
     @Test
     public void testOverrideAbstractBuildAndCallNewMethodWithRun() throws Exception {
         Run run = mock(Run.class);
-        Node node = mock(Node.class);
 
         OverrideAbstractBuild action = new OverrideAbstractBuild();
-        action.buildEnvVars(run, envVars, node);
+        action.buildEnvironment(run, envVars);
 
         assertFalse(action.wasDeprecatedMethodCalled());
     }
@@ -139,10 +136,9 @@ public class EnvironmentContributingActionTest {
     @Test
     public void testOverrideBothAndCallNewMethod() throws Exception {
         Run run = mock(Run.class);
-        Node node = mock(Node.class);
 
         OverrideBoth overrideRun = new OverrideBoth();
-        overrideRun.buildEnvVars(run, envVars, node);
+        overrideRun.buildEnvironment(run, envVars);
 
         assertTrue(overrideRun.wasRunCalled());
     }
diff --git a/core/src/test/java/hudson/model/ParametersActionTest.java b/core/src/test/java/hudson/model/ParametersActionTest.java
index 182ead6ec1..6f7321ed19 100644
--- a/core/src/test/java/hudson/model/ParametersActionTest.java
+++ b/core/src/test/java/hudson/model/ParametersActionTest.java
@@ -105,7 +105,7 @@ public class ParametersActionTest {
         
         // Interaction with build
         EnvVars vars = new EnvVars();
-        parametersAction.buildEnvVars(build, vars, build.getBuiltOn());
+        parametersAction.buildEnvironment(build, vars);
         assertEquals(2, vars.size());   
         parametersAction.createVariableResolver(build);
         
diff --git a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
index b1a989ead9..e2ab922e8d 100644
--- a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
+++ b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
@@ -155,7 +155,7 @@ public class EnvironmentVariableNodePropertyTest extends HudsonTestCase {
 		// use a timeout so we don't wait infinitely in case of failure
 		FreeStyleBuild build = project.scheduleBuild2(0).get(/*10, TimeUnit.SECONDS*/);
 		
-		System.out.println(build.getLog());
+		System.out.println(build.getLog()); // TODO switch to BuildWatcher when converted to JenkinsRule
 		assertEquals(Result.SUCCESS, build.getResult());
 
 		return builder.getEnvVars();