diff --git a/tensorflow/core/kernels/cwise_op_asin.cc b/tensorflow/core/kernels/cwise_op_asin.cc
index db6e21bfffe..c2637ab37e8 100644
--- a/tensorflow/core/kernels/cwise_op_asin.cc
+++ b/tensorflow/core/kernels/cwise_op_asin.cc
@@ -19,8 +19,7 @@ namespace tensorflow {
 REGISTER2(UnaryOp, CPU, "Asin", functor::asin, float, double);
 
 #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
-#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED) || \
-    !defined(MLIR_GENERATED_EXPERIMENTAL_KERNELS_ENABLED)
+#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED)
 REGISTER2(UnaryOp, GPU, "Asin", functor::asin, float, double);
 #endif
 #endif
diff --git a/tensorflow/core/kernels/cwise_op_asinh.cc b/tensorflow/core/kernels/cwise_op_asinh.cc
index 28356935905..17d07516bf8 100644
--- a/tensorflow/core/kernels/cwise_op_asinh.cc
+++ b/tensorflow/core/kernels/cwise_op_asinh.cc
@@ -21,8 +21,7 @@ REGISTER4(UnaryOp, CPU, "Asinh", functor::asinh, float, double, complex64,
           complex128);
 
 #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
-#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED) || \
-    !defined(MLIR_GENERATED_EXPERIMENTAL_KERNELS_ENABLED)
+#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED)
 REGISTER2(UnaryOp, GPU, "Asinh", functor::asinh, float, double);
 #endif
 #endif
diff --git a/tensorflow/core/kernels/cwise_op_gpu_asin.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_asin.cu.cc
index 95a9eb68663..4a59d245526 100644
--- a/tensorflow/core/kernels/cwise_op_gpu_asin.cu.cc
+++ b/tensorflow/core/kernels/cwise_op_gpu_asin.cu.cc
@@ -19,7 +19,9 @@ limitations under the License.
 
 namespace tensorflow {
 namespace functor {
+#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED)
 DEFINE_UNARY2(asin, float, double);
+#endif
 }  // namespace functor
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/kernels/cwise_op_gpu_asinh.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_asinh.cu.cc
index bb9e9a09168..81a5522f8ad 100644
--- a/tensorflow/core/kernels/cwise_op_gpu_asinh.cu.cc
+++ b/tensorflow/core/kernels/cwise_op_gpu_asinh.cu.cc
@@ -20,7 +20,9 @@ limitations under the License.
 
 namespace tensorflow {
 namespace functor {
+#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED)
 DEFINE_UNARY2(asinh, float, double);
+#endif
 }  // namespace functor
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/kernels/mlir_generated/BUILD b/tensorflow/core/kernels/mlir_generated/BUILD
index 00c86721c3b..3196411cb9b 100644
--- a/tensorflow/core/kernels/mlir_generated/BUILD
+++ b/tensorflow/core/kernels/mlir_generated/BUILD
@@ -41,6 +41,8 @@ filegroup(
         "gpu_op_abs.cc",
         "gpu_op_acos.cc",
         "gpu_op_acosh.cc",
+        "gpu_op_asin.cc",
+        "gpu_op_asinh.cc",
         "gpu_op_atan.cc",
         "gpu_op_atanh.cc",
         "gpu_op_ceil.cc",
@@ -75,8 +77,6 @@ filegroup(
     name = "experimental_unary_kernel_srcs",
     srcs = [
         "gpu_op_angle.cc",
-        "gpu_op_asin.cc",
-        "gpu_op_asinh.cc",
         "gpu_op_digamma.cc",
         "gpu_op_exp.cc",
         "gpu_op_expm1.cc",