Work on bug #8436.  It is mostly complete, but I need to fix the temp driver.