Revert "Switching back to threaded is still broken"

This reverts commit 975af06f11c8c7074b9592b57dd74845639d983d.