Revert "Merging activities with regarding user ids works"

This reverts commit 194945ff4c328c6f67ce8dd6c0d121cccd2930a1.