STABLE: Added better threading
commit
Revert "STABLE: Added better threading"

This reverts commit b74bb6b943322a5487aef219e170d9d2f1191ec7.