Revert "Threading Update"

This reverts commit 9c7900d8d514b26eba60e47bbacebf4768eafb4d.