Revert "Sync with Moeria"

This reverts commit 80545756f10a02817e127db685f7098344323144.