Revert "Merge branch 'PLA-1487-feed-refactoring' into release-226"

This reverts commit e4df38ec30e85eb7bb9307385f68a9c90f281acf, reversing
changes made to 8dcd21b6c4b58a6e100208d59062a67103053664.
Merge pull request #3688 from Wikia/release_revert

Release revert