This fixes #8287.  Two drivers needed to be fixed, also.