Revert "Merge pull request #1614 from Wikia/ve-cleanup"

This reverts commit fd59d366690bff047d7d9b00fdd1ba1bd1aba1d1, reversing
changes made to bb3e6cc716a25497b7676a81cb3750a4263740f1.