Revert "Merge pull request #3354 from Wikia/CE-738"

This reverts commit 5d05a2986ae1c7d9dd15581eae0735fbaeb9c0b0, reversing
changes made to 7a9bfce19221d0012dfcf5b06cae5c1460c71a73.