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