I'd just add dots at the end of the sentences in the comment blocks because that's project style, but I'm being picky, except that the logic looks quite good.
Since this is a bug affecting all stable branches, IMHO it will be a good idea to fix this before the upcoming minor releases.