[resend] revert series of umn.edu commits for v4.14.y