Work on bug #7494.  More work on getting this driver to work.