This fixes #7668.  Now all of the selection stuff is back in Driver.  It really got rid of quite a bit of complex code.