[resend] revert series of umn.edu commits for v5.10.y