reverting driver.c to commit 7e18791a8a