Switching back to threaded is still broken

Still an issue switching from non-threaded to threaded.