diff --git a/rosjava/src/main/java/org/ros/node/topic/TransportHints.java b/rosjava/src/main/java/org/ros/node/topic/TransportHints.java
index a05b0e9c6c72588c21b7063d1bf726c24c914baf..97ac02ede3e13151818cf48ba3c2829489c56856 100644
--- a/rosjava/src/main/java/org/ros/node/topic/TransportHints.java
+++ b/rosjava/src/main/java/org/ros/node/topic/TransportHints.java
@@ -1,43 +1,33 @@
 package org.ros.node.topic;
 
-import java.util.Map;
-
-import org.ros.internal.transport.ConnectionHeaderFields;
 import org.ros.node.ConnectedNode;
 
-import com.google.common.collect.Maps;
-
 
 /**
  * Provides a way of specifying network transport hints to
- * {@link ConnectedNode#newSubscriber(String, String)} and
- * {@link ConnectedNode#newSubscriber(org.ros.namespace.GraphName, String)}.
+ * {@link ConnectedNode#newSubscriber(org.ros.namespace.GraphName, String, TransportHints)} and
+ * {@link ConnectedNode#newSubscriber(String, String, TransportHints)}.
  *
  * @author stefan.glaser@hs-offenburg.de (Stefan Glaser)
  */
 public class TransportHints {
 
-  Map<String, String> options;
+  private boolean tcpNoDelay;
 
- public TransportHints() {
-   this.options = Maps.newConcurrentMap();
+  public TransportHints() {
+    this(false);
   }
 
   public TransportHints(boolean tcpNoDelay) {
-    tcpNoDelay(tcpNoDelay);
+    this.tcpNoDelay = tcpNoDelay;
   }
 
-  public TransportHints tcpNoDelay(boolean nodelay) {
-    options.put(ConnectionHeaderFields.TCP_NODELAY, nodelay ? "1" : "0");
-
+  public TransportHints tcpNoDelay(boolean tcpNoDelay) {
+    this.tcpNoDelay = tcpNoDelay;
     return this;
   }
 
   public boolean getTcpNoDelay() {
-    return "1".equals(options.get(ConnectionHeaderFields.TCP_NODELAY));
-  }
-
-  public Map<String, String> getOptions() {
-    return options;
+    return tcpNoDelay;
   }
 }