Release 204 reverts

Reverts #2434 and 5922ba0.

@Wikia/platform-team  / @kvas-damian / @lgarczewski