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.
It's a really bad thing. The whole discussion item shape really bugs me. Can you try making the change you want and see if anything breaks with production data on clone?