Revert "Merge pull request #3269 from Wikia/CONN-464"

This reverts commit 06c64b036c7c7a7d92e319cbbcca0bf85166ddef, reversing
changes made to c5e3ecdb931a1f673d90806ac089579abcd3e832.

@macbre can you take a look ?