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