CON-679 | Revert "Merge pull request #2839 from Wikia/CON-621"

https://wikia-inc.atlassian.net/browse/CON-679