Well, maybe not. Rebasing out the patch doesn't seem to help.