Revert "Merge pull request #2150 from Wikia/VE-645"

This reverts commit 82bfff79428d51bff0759dc450b1f58ea00cfcdb, reversing
changes made to 38ce48595fcd7b17547fb0676eddfd05723e9e48.