diff --git a/core/src/main/java/hudson/cli/CreateNodeCommand.java b/core/src/main/java/hudson/cli/CreateNodeCommand.java
index a1a826618ed83a639fba9f511db01c44c219c794..36aa7242db6ab80b3753ac0cb1ce7145838b33aa 100644
--- a/core/src/main/java/hudson/cli/CreateNodeCommand.java
+++ b/core/src/main/java/hudson/cli/CreateNodeCommand.java
@@ -63,11 +63,6 @@ public class CreateNodeCommand extends CLICommand {
             newNode.setNodeName(nodeName);
         }
 
-        if(newNode instanceof Slave) { //change userId too
-            User user = User.current();
-            ((Slave) newNode).setUserId(user==null ? "anonymous" : user.getId());
-        }
-
         if (jenkins.getNode(newNode.getNodeName()) != null) {
             throw new IllegalStateException("Node '" + newNode.getNodeName() + "' already exists");
         }
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 4742d7000d4cae4543685ed8bb751d05b71ccd1b..b499b8ce805bcf9ae07bb57b7055e326e29963e3 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -258,10 +258,6 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
             String xml = Jenkins.XSTREAM.toXML(src);
             Node result = (Node) Jenkins.XSTREAM.fromXML(xml);
             result.setNodeName(name);
-            if(result instanceof Slave){ //change userId too
-                User user = User.current();
-                ((Slave)result).setUserId(user==null ? "anonymous" : user.getId());
-             }
             result.holdOffLaunchUntilSave = true;
 
             app.addNode(result);
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 75f88ea92eed846b15c023658facdb80044edbfb..32db580e1be4884fed18cb31b2ed012c8cab711c 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -30,6 +30,7 @@ import hudson.EnvVars;
 import hudson.FilePath;
 import hudson.Launcher;
 import hudson.Launcher.RemoteLauncher;
+import hudson.RestrictedSince;
 import hudson.Util;
 import hudson.cli.CLI;
 import hudson.model.Descriptor.FormException;
@@ -73,6 +74,7 @@ import jenkins.util.SystemProperties;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.HttpResponse;
@@ -155,9 +157,10 @@ public abstract class Slave extends Node implements Serializable {
     private transient volatile Set<Label> labels;
 
     /**
-     * Id of user which creates this agent {@link User}.
+     * Removed with no replacement.
      */
-    private String userId;
+    @Deprecated
+    private transient String userId;
 
     /**
      * Use {@link #Slave(String, String, ComputerLauncher)} and set the rest through setters.
@@ -204,13 +207,6 @@ public abstract class Slave extends Node implements Serializable {
         this.nodeProperties.replaceBy(nodeProperties);
          Slave node = (Slave) Jenkins.get().getNode(name);
 
-       if(node!=null){
-            this.userId= node.getUserId(); //agent has already existed
-        }
-       else{
-            User user = User.current();
-            userId = user!=null ? user.getId() : "anonymous";
-        }
         if (name.equals(""))
             throw new FormException(Messages.Slave_InvalidConfig_NoName(), null);
 
@@ -225,13 +221,25 @@ public abstract class Slave extends Node implements Serializable {
      * Return id of user which created this agent
      *
      * @return id of user
+     *
+     * @deprecated Removed with no replacement
      */
+    @Deprecated
+    @Restricted(DoNotUse.class)
+    @RestrictedSince("TODO")
     public String getUserId() {
         return userId;
     }
 
+    /**
+     * This method no longer does anything.
+     *
+     * @deprecated Removed with no replacement
+     */
+    @Deprecated
+    @Restricted(DoNotUse.class)
+    @RestrictedSince("TODO")
     public void setUserId(String userId){
-        this.userId = userId;
     }
 
     public ComputerLauncher getLauncher() {
diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
index ecd9dbf11ec48d753abea8be36d807218b038bcc..015283e4fdceb5e167522411e7b5191184b4dcf2 100644
--- a/core/src/main/resources/hudson/model/Computer/index.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -71,22 +71,6 @@ THE SOFTWARE.
         <p>${%title.no_manual_launch(it.retentionStrategy.descriptor.displayName)}</p>
       </j:if>
 
-     <!-- Display user which created this node -->
-     <j:set var="user" value="${app.getUser(it.node.userId)}"/>
-     <j:if test="${it.node.userId !=null and user!=null}">
-       <p>
-          ${%Created by} 
-         <j:choose>
-            <j:when test="${it.node.userId.equals('anonymous')}">
-             ${%anonymous user}
-            </j:when>
-           <j:otherwise>
-             <a href="${app.rootUrl}${user.url}">${user.displayName}</a>
-            </j:otherwise>
-         </j:choose>
-       </p>
-      </j:if>
-
         <j:if test="${it.node.assignedLabels.size() gt 1}">
         <div>
           <h2>${%Labels}</h2>
diff --git a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
index 329e2d4b913f99baee9d936c0a27295ddaa5a597..0ae5fc30bedfb000dd29efd62dd5b97f1bd38b1c 100644
--- a/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/CreateNodeCommandTest.java
@@ -78,7 +78,6 @@ public class CreateNodeCommandTest {
         final Slave updatedSlave = (Slave) j.jenkins.getNode("SlaveFromXML");
         assertThat(updatedSlave.getNodeName(), equalTo("SlaveFromXML"));
         assertThat(updatedSlave.getNumExecutors(), equalTo(42));
-        assertThat(updatedSlave.getUserId(), equalTo(command.user().getId()));
     }
 
     @Test public void createNodeSpecifyingNameExplicitly() throws Exception {
@@ -96,7 +95,6 @@ public class CreateNodeCommandTest {
         final Slave updatedSlave = (Slave) j.jenkins.getNode("CustomSlaveName");
         assertThat(updatedSlave.getNodeName(), equalTo("CustomSlaveName"));
         assertThat(updatedSlave.getNumExecutors(), equalTo(42));
-        assertThat(updatedSlave.getUserId(), equalTo(command.user().getId()));
     }
 
     @Test public void createNodeSpecifyingDifferentNameExplicitly() throws Exception {
@@ -116,7 +114,6 @@ public class CreateNodeCommandTest {
         final Slave updatedSlave = (Slave) j.jenkins.getNode("CustomSlaveName");
         assertThat(updatedSlave.getNodeName(), equalTo("CustomSlaveName"));
         assertThat(updatedSlave.getNumExecutors(), equalTo(42));
-        assertThat(updatedSlave.getUserId(), equalTo(command.user().getId()));
     }
 
     @Test public void createNodeShouldFailIfNodeAlreadyExist() throws Exception {