Revert "RaidDruid_Merge"

This reverts commit 1a1eb8b68c8cd5ac2c49290b2fac4fd0b3ae7aee.
Revert "Revert "RaidDruid_Merge""

This reverts commit 33e9901f3b0b1423853110bbac030c7915f78d51.