Re: [resend] revert series of umn.edu commits for v5.11.y