Revert "Merge pull request #113 from Wikia/DAR-3127"

This reverts commit b32b11bbaebb07a875e1d2a3b9afe3ce95485223, reversing
changes made to 76d347db125397a5ca0b48bdc202e744eb9545b7.