Revert "Merge pull request #284 from Wikia/HG-198"

This reverts commit 17053b12f89cef771413d3b9cc04db1a992efc88, reversing
changes made to 55fed33f1e78f478a7e0a507ce9e2a2fc256202d.