diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 03c10828d..6e83faab7 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -482,18 +482,6 @@ void IPCThreadState::joinThreadPool(bool isMain)
         if(result == TIMED_OUT && !isMain) {
             break;
         }
-
-        // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
-        // FIXME: we sometimes get unexplained EINVAL which causes this
-        // thread to spin forever. TEMPORARILY allow it to exit.
-        // We should probably assert on eng builds
-        if(result == -EINVAL && !isMain) {
-            ALOGE("**** THREAD %p (PID %d) ERROR (%d) LEAVING THE THREAD POOL\n",
-                (void*)pthread_self(), getpid(), result);
-            break;
-        }
-        // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK
-
     } while (result != -ECONNREFUSED && result != -EBADF);
 
     LOG_THREADPOOL("**** THREAD %p (PID %d) IS LEAVING THE THREAD POOL err=%p\n",