Work on bug #7826.  This needs to be tested better, and I need to check to see if it actually works on the devices specified.