Revert "Merge pull request #1991 from Wikia/VE-573"

This reverts commit 2b30ce0419b59cd5e80b4f8f10a6c4c5f3502134, reversing
changes made to 07e9b61d2196e105549a0a31d9f50b9d55d3d38e.