Also, rename an old patch because I've soured on my own strategy for naming patches after merge request IDs, which doesn't tell you what the patch actually does. Resolves: RHEL-84440
