Tried to send this with git-format-patch, but couldn't tell if it
worked; sorry if it shows up as a duplicate.