Revert "Tweaking threads again"

This reverts commit 68eb3ceac8d6e9c76cf9c7e3574b1b987583acf5.