Merge "FeedUtils: Remove weird commented-out block"