This part of the change is really not related to this fix, and just something that was not in the branch but on the tag. For some reason got out of sync.

In any case, this is the one we tested. Since we do not need to upgrade, we wont.