I'm not going to touch the other driver in this directory, as it will
need more than just minor fixups to get correct.