Merge "Revert "More judicious permission-change handling"" into main