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

This reverts commit 48fa9403799401a3b9a920eb7946978598b8914b.
Fix problem introduced by fd59d366690bff047d7d9b00fdd1ba1bd1aba1d1