diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index dc5ef97..c1e2843 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -387,9 +387,10 @@
             Driver driver = driverService.getDriver(sw.manufacturerDescription(),
                     sw.hardwareDescription(),
                     sw.softwareDescription());
-            if (driver != null) {
-                annotationsBuilder.set(AnnotationKeys.DRIVER, driver.name());
-            }
+            // FIXME: The following breaks the STC tests and will require to be revisited.
+//            if (driver != null) {
+//                annotationsBuilder.set(AnnotationKeys.DRIVER, driver.name());
+//            }
 
             SparseAnnotations annotations = annotationsBuilder.build();