Revert "Merge pull request #1068 from Dr15Jones/threadSafePluginSystem_7_X"

This reverts commit fb4918a36f9e58634640629c76336ef6b434af87, reversing
changes made to 265c27b36a01b7e3f8cfbf8a0cd72cc1bc0cb5b1.
Merge pull request #1080 from nclopezo/revert-pr168

Revert "Merge pull request #1068 from Dr15Jones/threadSafePluginSystem_7...