--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp	Fri Dec 04 04:29:31 2015 +0000
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepThread.cpp	Fri Dec 04 04:06:37 2015 -0500
@@ -144,9 +144,6 @@
     _cmst = NULL;
     Terminator_lock->notify();
   }
-
-  // Thread destructor usually does this..
-  ThreadLocalStorage::set_thread(NULL);
 }
 
 #ifndef PRODUCT