Revert some of https://github.com/gc/TrinityCore/commit/36ed24f4e841ddb585c337c2a7e8a1e285a47978
Merge pull request #39 from Nyeriah/patch-3

Revert some of "sindragosa fixes"