When doing the 5.0 rebase, I mistakenly thought a conflict meant a patch had been merged. Turns out, it was an actual (minor) conflict. Bring back the rebased patch which can actually be dropped with 5.1.