Revert 4f6c901..b6467f5

This rolls back to commit 4f6c901453fd0c89a4fb0fb937e2f170e0e31e45.
Revert b6467f5..3485e72

This rolls back to commit b6467f51c65654963481ffe55f63749c109687c4.
feed parsing