diff --git a/api/net/sf/briar/api/TransportConfig.java b/api/net/sf/briar/api/TransportConfig.java
index e57d8388db41114a3e03810e419643ca45f4ebf4..da2c8bbc0f413d7ba399544a05927c277c0defe0 100644
--- a/api/net/sf/briar/api/TransportConfig.java
+++ b/api/net/sf/briar/api/TransportConfig.java
@@ -1,9 +1,9 @@
 package net.sf.briar.api;
 
+import java.util.Hashtable;
 import java.util.Map;
-import java.util.TreeMap;
 
-public class TransportConfig extends TreeMap<String, String> {
+public class TransportConfig extends Hashtable<String, String> {
 
 	private static final long serialVersionUID = 2330384620787778596L;
 
diff --git a/api/net/sf/briar/api/TransportProperties.java b/api/net/sf/briar/api/TransportProperties.java
index 8eda0706cfa22af6e58904c55a9207b4fc5c7c86..df87c7d3aa49526c62ddbd2b3f81603bd1abc4bd 100644
--- a/api/net/sf/briar/api/TransportProperties.java
+++ b/api/net/sf/briar/api/TransportProperties.java
@@ -1,9 +1,9 @@
 package net.sf.briar.api;
 
+import java.util.Hashtable;
 import java.util.Map;
-import java.util.TreeMap;
 
-public class TransportProperties extends TreeMap<String, String> {
+public class TransportProperties extends Hashtable<String, String> {
 
 	private static final long serialVersionUID = 7533739534204953625L;