Fix: Feeds #6032

Why is this being split into two steps? It doesn't seem to change the output and splitting it up will reduce performance.