diff --git a/torch_xla/csrc/layout_manager.cpp b/torch_xla/csrc/layout_manager.cpp
index e1d8b8e9a2e..33deba58f24 100644
--- a/torch_xla/csrc/layout_manager.cpp
+++ b/torch_xla/csrc/layout_manager.cpp
@@ -185,9 +185,9 @@ xla::Shape MakeArrayShapeFromDimensions(
                                *layout_ptr);
   }
 
-  bool tpu_layout_env =
-    runtime::sys_util::GetEnvBool("XLA_TPU_LAYOUT", true);
-  if (tpu_layout_env && dimensions.size() > 1 && hw_type == XlaDeviceType::TPU) {
+  bool tpu_layout_env = runtime::sys_util::GetEnvBool("XLA_TPU_LAYOUT", true);
+  if (tpu_layout_env && dimensions.size() > 1 &&
+      hw_type == XlaDeviceType::TPU) {
     return MakeTpuShape(dimensions, dynamic_dimensions, type);
   }
   return MakeTorchTensorLayout(dimensions, dynamic_dimensions, type);