Revert "Merge pull request #1939 from Wikia/ve-sprint-5"

This reverts commit 2057c5571c8f0052c9141709836cae7c9cebff3b, reversing
changes made to 66051fea1ba69119fd0beab3153b7fc8754555d6.