Revert "Fix for Draenor"

This reverts commit 50c074938a68b9778680d50c6b1fb11d88183f01.