[c12736] partly revert [c12731]

Signed-off-by: Dramacydal <PulLumBerMal@gmail.com>
Merge https://github.com/cmangos/mangos-cata into Manti_vs_Zamalaev