diff --git a/servers/src/main/java/tachyon/worker/netty/NettyDataServer.java b/servers/src/main/java/tachyon/worker/netty/NettyDataServer.java
index <HASH>..<HASH> 100644
--- a/servers/src/main/java/tachyon/worker/netty/NettyDataServer.java
+++ b/servers/src/main/java/tachyon/worker/netty/NettyDataServer.java
@@ -112,8 +112,7 @@ public final class NettyDataServer implements DataServer {
   public String getBindHost() {
     // Return value of io.netty.channel.Channel.localAddress() must be down-cast into types like
     // InetSocketAddress to get detailed info such as port.
-    // TODO(andrew): Avoid using getHostString(), which isn't supported in Java 6
-    return ((InetSocketAddress) mChannelFuture.channel().localAddress()).getHostString();
+    return ((InetSocketAddress) mChannelFuture.channel().localAddress()).getHostName();
   }
 
   /**
[TACHYON-<I>] Avoid getHostString, which is not supported in Java 6