Revert "Merge pull request #1615 from Wikia/DAR-2165-v2"

This reverts commit 3699aa261c42ab3b63e949cd4b6d7b1def13a55f, reversing
changes made to e64ebb576629fa635513958b63498ccdaa35544d.