diff --git a/CHANGES.txt b/CHANGES.txt
index 2052f703f87..12add5121e0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -83,6 +83,9 @@ Trunk (unreleased changes)
     HADOOP-6861. Adds new non-static methods in Credentials to read and 
     write token storage file. (Jitendra Pandey & Owen O'Malley via ddas)
 
+    HADOOP-6877. Common part of HDFS-1178 (NameNode servlets should communicate
+    with NameNode directrly). (Kan Zhang via jghoman)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/src/java/org/apache/hadoop/ipc/RemoteException.java b/src/java/org/apache/hadoop/ipc/RemoteException.java
index 01e8dbfc063..d431b4a898c 100644
--- a/src/java/org/apache/hadoop/ipc/RemoteException.java
+++ b/src/java/org/apache/hadoop/ipc/RemoteException.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.lang.reflect.Constructor;
 
 import org.xml.sax.Attributes;
-import org.znerd.xmlenc.XMLOutputter;
 
 public class RemoteException extends IOException {
   /** For java.io.Serializable */
@@ -93,20 +92,6 @@ public class RemoteException extends IOException {
     return ex;
   }
 
-  /** Write the object to XML format */
-  public void writeXml(String path, XMLOutputter doc) throws IOException {
-    doc.startTag(RemoteException.class.getSimpleName());
-    doc.attribute("path", path);
-    doc.attribute("class", getClassName());
-    String msg = getLocalizedMessage();
-    int i = msg.indexOf("\n");
-    if (i >= 0) {
-      msg = msg.substring(0, i);
-    }
-    doc.attribute("message", msg.substring(msg.indexOf(":") + 1).trim());
-    doc.endTag();
-  }
-
   /** Create RemoteException from attributes */
   public static RemoteException valueOf(Attributes attrs) {
     return new RemoteException(attrs.getValue("class"),