diff --git a/moveit2.repos b/moveit2.repos
index 6ce029c513..03026fa73a 100644
--- a/moveit2.repos
+++ b/moveit2.repos
@@ -3,7 +3,8 @@ repositories:
   geometric_shapes:
     type: git
     url: https://github.com/moveit/geometric_shapes.git
-    version: ros2
+    #version: 4f65a38  # TODO: Fix the issues introduced in https://github.com/moveit/geometric_shapes/pull/239
+    version: revert-extend-with-transformed-box
   moveit_msgs:
     type: git
     url: https://github.com/moveit/moveit_msgs.git