Revert "Bug #64 BUG My Plugins"

This reverts commit cae59cbb1b19d7f96f5ae38d1711dc5c8ea8d658.
Revert "Bug #64 BUG My Plugins"

This reverts commit 3994c4bc44510aa49f036fbc02b432eaa695da9e.