Comment 25 for bug 819002

Given the magnitude of the attached patch and the possibility of regressions we prefer to take this patch (or another patch that addresses this issue) via the stable upstream process. Please work with the upstream developers to get your patch accepted.