Here are the i810 and i830 fixes.  I don't have either of these, so I
can't test them, but they're pretty straightforward.