Revert "Merge pull request #3292 from Wikia/CONN-438"

This change caused CONN-480