diff --git a/.BUILDING.txt.swp b/.BUILDING.txt.swp
deleted file mode 100644
index 1fb0c25d0a..0000000000
Binary files a/.BUILDING.txt.swp and /dev/null differ
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index fa4f573da5..a9850aa7f5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -1171,7 +1171,6 @@ public void registerDatanode(DatanodeRegistration nodeReg)
         nodeN = null;
       }
   
-      boolean updateHost2DatanodeMap = false;
       if (nodeS != null) {
         if (nodeN == nodeS) {
           // The same datanode has been just restarted to serve the same data 
@@ -1190,11 +1189,7 @@ public void registerDatanode(DatanodeRegistration nodeReg)
             nodes with its data cleared (or user can just remove the StorageID
             value in "VERSION" file under the data directory of the datanode,
             but this is might not work if VERSION file format has changed 
-         */
-          // Check if nodeS's host information is same as nodeReg's, if not,
-          // it needs to update host2DatanodeMap accordringly.
-          updateHost2DatanodeMap = !nodeS.getXferAddr().equals(nodeReg.getXferAddr());
-
+         */        
           NameNode.stateChangeLog.info("BLOCK* registerDatanode: " + nodeS
               + " is replaced by " + nodeReg + " with the same storageID "
               + nodeReg.getDatanodeUuid());
@@ -1204,11 +1199,6 @@ nodes with its data cleared (or user can just remove the StorageID
         try {
           // update cluster map
           getNetworkTopology().remove(nodeS);
-
-          // Update Host2DatanodeMap
-          if (updateHost2DatanodeMap) {
-            getHost2DatanodeMap().remove(nodeS);
-          }
           if(shouldCountVersion(nodeS)) {
             decrementVersionCount(nodeS.getSoftwareVersion());
           }
@@ -1227,11 +1217,6 @@ nodes with its data cleared (or user can just remove the StorageID
             nodeS.setDependentHostNames(
                 getNetworkDependenciesWithDefault(nodeS));
           }
-
-          if (updateHost2DatanodeMap) {
-            getHost2DatanodeMap().add(nodeS);
-          }
-
           getNetworkTopology().add(nodeS);
           resolveUpgradeDomain(nodeS);
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
index 232424d440..5f5452ac16 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java
@@ -138,35 +138,6 @@ public void testNumVersionsCorrectAfterReregister()
         mapToCheck.get("version1").intValue(), 1);
   }
 
-  /**
-   * This test checks that if a node is re-registered with a different ip, its
-   * host2DatanodeMap is correctly updated with the new ip.
-   */
-  @Test
-  public void testHost2NodeMapCorrectAfterReregister()
-          throws IOException, InterruptedException {
-    //Create the DatanodeManager which will be tested
-    FSNamesystem fsn = Mockito.mock(FSNamesystem.class);
-    Mockito.when(fsn.hasWriteLock()).thenReturn(true);
-    Configuration conf = new Configuration();
-    DatanodeManager dm = mockDatanodeManager(fsn, conf);
-
-    String storageID = "someStorageID1";
-    String ipOld = "someIPOld" + storageID;
-    String ipNew = "someIPNew" + storageID;
-
-    dm.registerDatanode(new DatanodeRegistration(
-            new DatanodeID(ipOld, "", storageID, 9000, 0, 0, 0),
-            null, null, "version"));
-
-    dm.registerDatanode(new DatanodeRegistration(
-            new DatanodeID(ipNew, "", storageID, 9000, 0, 0, 0),
-            null, null, "version"));
-
-    assertNull("should be no node with old ip", dm.getDatanodeByHost(ipOld));
-    assertNotNull("should be a node with new ip", dm.getDatanodeByHost(ipNew));
-  }
-
   /**
    * This test sends a random sequence of node registrations and node removals
    * to the DatanodeManager (of nodes with different IDs and versions), and