Revert "Merge pull request #3188 from Wikia/VE-885"

This reverts commit e5100a03e5522e30646b50c13ac5cfad01f69b67, reversing
changes made to 325c521cac974e075bcc1b1ff1f4b430db9a9fa2.