Revert "Merge pull request #2839 from Wikia/CON-621"

This reverts commit 75d27a79bd4bc98c769b197283f971fc44e2138b, reversing
changes made to 3f315b232badd5dfc63ab862ce67f1f3ba79c012.
Merge pull request #2887 from Wikia/CON-679

CON-679 | Revert "Merge pull request #2839 from Wikia/CON-621"