[Driver] Revert previous commit