--- a/jdk/src/jdk.httpserver/share/classes/module-info.java	Mon Apr 18 20:58:19 2016 +0100
+++ b/jdk/src/jdk.httpserver/share/classes/module-info.java	Mon Apr 18 20:58:21 2016 +0100
@@ -25,8 +25,7 @@
 
 module jdk.httpserver {
     requires java.logging;
-    // 8153372
-    requires jdk.unsupported;
+
     exports com.sun.net.httpserver;
     exports com.sun.net.httpserver.spi;
     uses com.sun.net.httpserver.spi.HttpServerProvider;

--- a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Mon Apr 18 20:58:19 2016 +0100
+++ b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Mon Apr 18 20:58:21 2016 +0100
@@ -36,7 +36,6 @@
 import com.sun.net.httpserver.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.misc.ManagedLocalsThread;
 import sun.net.httpserver.HttpConnection.State;
 
 /**
@@ -143,7 +142,7 @@
         if (executor == null) {
             executor = new DefaultExecutor();
         }
-        dispatcherThread = new ManagedLocalsThread(dispatcher);
+        dispatcherThread = new Thread(null, dispatcher, "HTTP-Dispatcher", 0, false);
         started = true;
         dispatcherThread.start();
     }