Revert "Merge pull request #2133 from Wikia/DAR-2398"

This reverts commit c5f3b37680b75ab5064147060b9b9f65f1c6ca4f, reversing
changes made to 8dec556df952bad65bd00543485bfd11764bc561.