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

This reverts commit f7a31e077317301416e26e87fa786dc230e413c0.