As your chnages are very important, would you mind providing these as a pull request to the upstream repo?