This fixes #8293.  The framework for the drivers is in place.