Revert "Merge pull request #1180 from Wikia/DAR-535"

This reverts commit d10f585efe5d7228e5bda0c98ce1547dbf6225d4, reversing
changes made to e3627b714e74137415f4b14e55ee8e3e62dda245.