reversing some changes
reversing some changes
Merge pull request #2181 from ZappoMan/bugfixes

particle deadlock and crash fixes a different way