Merge "Revert "Revert "Make all permissions per-user."""