Revert "Merge pull request #4768 from Wikia/ve-sprint-26"

This reverts commit 1c6bdcbf0be576ff5cedf8281fa113f8768a052b.