Revert "Merge pull request #1896 from Wikia/BAC-709+945"

This reverts commit 9c17a871a236bfede24fbcaa9d55fedaea50a828, reversing
changes made to 26ee973a5d0c233a48afcf0724a3ca9cddcef9d1.