Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'

See merge request !9974