--- a/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java	Mon Apr 18 20:58:21 2016 +0100
+++ b/jdk/src/java.logging/share/classes/java/util/logging/LogManager.java	Mon Apr 18 20:58:30 2016 +0100
@@ -42,7 +42,6 @@
 import java.util.stream.Stream;
 import jdk.internal.misc.JavaAWTAccess;
 import jdk.internal.misc.SharedSecrets;
-import sun.misc.ManagedLocalsThread;
 import sun.util.logging.internal.LoggingProviderImpl;
 
 /**
@@ -254,9 +253,10 @@
 
     // This private class is used as a shutdown hook.
     // It does a "reset" to close all open handlers.
-    private class Cleaner extends ManagedLocalsThread {
+    private class Cleaner extends Thread {
 
         private Cleaner() {
+            super(null, null, "Logging-Cleaner", 0, false);
             /* Set context class loader to null in order to avoid
              * keeping a strong reference to an application classloader.
              */

--- a/jdk/src/java.logging/share/classes/module-info.java	Mon Apr 18 20:58:21 2016 +0100
+++ b/jdk/src/java.logging/share/classes/module-info.java	Mon Apr 18 20:58:30 2016 +0100
@@ -24,8 +24,6 @@
  */
 
 module java.logging {
-    // 8153158
-    requires jdk.unsupported;
     exports java.util.logging;
     provides jdk.internal.logger.DefaultLoggerFinder with
         sun.util.logging.internal.LoggingProviderImpl;