Attempt hotfix for discussion rss feed

DO NOT MERGE (I want to see these tests pass and test on clone before it's ready)

Attempt fix for certain discussion feeds erroring.