--- old/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-11-04 23:04:44.491833228 -0500
+++ new/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-11-04 23:04:42.999749142 -0500
@@ -125,7 +125,7 @@
                         int abort_if_unrecognized) {
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
-  Thread* t = ThreadLocalStorage::get_thread_slow();
+  Thread* t = Thread::current();
 
   SignalHandlerMark shm(t);