Comment 1 for bug 896377

You may want to try the attached patch (for 6.0 series)