I didn't rebase. I merged by changes into a new copy of upstream master, which is why I opened a new PR for it (I still have to figure out how to fix those rebase errors.) In any case, I specifically changed this back to the version I had by mistake.