Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations""

This reverts commit 2c7848e3.