The prior "patch" I sent was in fact a diff; this one is formatted with `git format-patch`. Content is almost exactly the same as the prior diff.