Any chance of using the upstream patch directly from the Subversion?