diff --git a/client/client.go b/client/client.go
index 914e1d2ac..46d8bd1d7 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1053,6 +1053,16 @@ func (c *Client) updateNodeFromDriver(name string, fingerprint, health *structs.
 				}
 			}
 		}
+
+		// COMPAT Remove in Nomad 0.10
+		// We maintain the driver enabled attribute until all drivers expose
+		// their attributes as DriverInfo
+		driverName := fmt.Sprintf("driver.%s", name)
+		if fingerprint.Detected {
+			c.config.Node.Attributes[driverName] = "1"
+		} else {
+			delete(c.config.Node.Attributes, driverName)
+		}
 	}
 
 	if health != nil {
diff --git a/client/fingerprint_manager.go b/client/fingerprint_manager.go
index abe2f6ed6..499cc16d7 100644
--- a/client/fingerprint_manager.go
+++ b/client/fingerprint_manager.go
@@ -345,10 +345,6 @@ func (fm *FingerprintManager) fingerprintDriver(name string, f fingerprint.Finge
 		return false, err
 	}
 
-	if node := fm.updateNodeAttributes(&response); node != nil {
-		fm.setNode(node)
-	}
-
 	// Remove the health check attribute indicating the status of the driver,
 	// as the overall driver info object should indicate this.
 	delete(response.Attributes, fmt.Sprintf("driver.%s", name))