Comment 2 for bug 242063

I've added this patch locally and filed it upstream. In the future, try to make the diffs unified instead. Also, if you want to submit it directly upstream yourself and link us to bugs, it would go on a bit faster too.