Revert refactoring of Driver to Session. Files affected should be identical to that which is two revisions earlier (e.g. if 1.3 is being checked in here, it should be identical to 1.1).