diff --git a/tensorflow/core/ops/compat/BUILD b/tensorflow/core/ops/compat/BUILD
index e4b2cfa9666..299076d8cfd 100644
--- a/tensorflow/core/ops/compat/BUILD
+++ b/tensorflow/core/ops/compat/BUILD
@@ -39,10 +39,6 @@ tf_cc_test(
         "ops_history_v*/*.pbtxt",
         "ops_history.v*.pbtxt",
     ]),
-    tags = [
-        "no_oss",  # TODO(b/149575105): Reenable when fix lands.
-        "notap",  # TODO(b/149575105): Reenable when fix lands.
-    ],
     deps = [
         ":op_compatibility_lib",
         "//tensorflow/core:framework",
diff --git a/tensorflow/core/ops/compat/ops_history_v1/VarHandleOp.pbtxt b/tensorflow/core/ops/compat/ops_history_v1/VarHandleOp.pbtxt
index 6e7d9a38cad..b5722b97032 100644
--- a/tensorflow/core/ops/compat/ops_history_v1/VarHandleOp.pbtxt
+++ b/tensorflow/core/ops/compat/ops_history_v1/VarHandleOp.pbtxt
@@ -28,41 +28,3 @@ op {
   }
   is_stateful: true
 }
-op {
-  name: "VarHandleOp"
-  output_arg {
-    name: "resource"
-    type: DT_RESOURCE
-  }
-  attr {
-    name: "container"
-    type: "string"
-    default_value {
-      s: ""
-    }
-  }
-  attr {
-    name: "shared_name"
-    type: "string"
-    default_value {
-      s: ""
-    }
-  }
-  attr {
-    name: "dtype"
-    type: "type"
-  }
-  attr {
-    name: "shape"
-    type: "shape"
-  }
-  attr {
-    name: "allowed_devices"
-    type: "list(string)"
-    default_value {
-      list {
-      }
-    }
-  }
-  is_stateful: true
-}