Partially revert #379
Activity