Revert "ActivityComment"

This reverts commit 8de46d756711f9ce0c2492bc3683a9fc882b6c3a.