diff --git a/contrib/s2geometry b/contrib/s2geometry
index 0146e2d1355..6522a40338d 160000
--- a/contrib/s2geometry
+++ b/contrib/s2geometry
@@ -1 +1 @@
-Subproject commit 0146e2d1355828f8f633cb050948250ad7406c57
+Subproject commit 6522a40338d58752c2a4227a3fc2bc4107c73e43
diff --git a/contrib/s2geometry-cmake/CMakeLists.txt b/contrib/s2geometry-cmake/CMakeLists.txt
index 5eabe71b538..48562b8cead 100644
--- a/contrib/s2geometry-cmake/CMakeLists.txt
+++ b/contrib/s2geometry-cmake/CMakeLists.txt
@@ -1,7 +1,6 @@
 option(ENABLE_S2_GEOMETRY "Enable S2 Geometry" ${ENABLE_LIBRARIES})
 
-# ARCH_S390X broke upstream, it can be re-enabled once https://github.com/google/s2geometry/pull/372 is merged
-if (NOT ENABLE_S2_GEOMETRY OR ARCH_S390X)
+if (NOT ENABLE_S2_GEOMETRY)
     message(STATUS "Not using S2 Geometry")
     return()
 endif()