Revert "Merge pull request #4445 from Wikia/PLATFORM-404"

This reverts commit 5a2919411f72541ab5bd9b2fd1970e7f7e4e7c81, reversing
changes made to c5bcf2c6bb55176112e22e7c94997c42ddf82ee5.

Revert #4445