Revert "Merge pull request #4104 from Wikia/VE-1215"

This reverts commit 46491be0b31aa2cc19ce227226312dfffe4e7f98, reversing
changes made to 687948a07670d055cc4ea0fdb02524cf6d1a14a7.