Fix horked RSS feeds

Somehow we ended up with merge conflict cruft in here. :-/