--- old/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2015-11-04 23:03:57.881206487 -0500
+++ new/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2015-11-04 23:03:56.389122401 -0500
@@ -405,7 +405,7 @@
                         int abort_if_unrecognized) {
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
-  Thread* t = ThreadLocalStorage::get_thread_slow();
+  Thread* t = Thread::current();
 
   // Must do this before SignalHandlerMark, if crash protection installed we will longjmp away
   // (no destructors can be run)