OK, so that worked for that specific commit, but if I go back in time to May, when I discovered the issue, that patch no longer applies.