Revert "Clean up Activity permissions"

This reverts commit 4dcd85068f649e2b91af241439d341d8040cb4f8.

Turns out it broke some stuff and didn't improve readability at all.
Merge branch 'master' into action-guide-view-fixes