Revert "Revert "Discussion repeat fix""
Merge pull request #4953 from guardian/revert-4949-revert-4943-discussion-repeat-fix

Revert "Revert "Discussion repeat fix""