This fixes #7616.  It now checks for the driver interface.