Revert "Temp workaround for delete activities after merge"

This reverts commit 8f7573f3662569560f7bd2e2008169dc48e2b17a.