Re-apply driver crash fix