Revert "Merge branch 'public_activity' into development"

This reverts commit 0d1ec74053d92029b984b368cf3ecdc1d674cdc8, reversing
changes made to e887f6b5de21f27bc9f3900169f5dcf25c74151e.