Merge "Revert "More pthreads cleanup.""