diff --git a/projects/s2geometry/build.sh b/projects/s2geometry/build.sh
index 0ec765b85..fb8ce6e7d 100755
--- a/projects/s2geometry/build.sh
+++ b/projects/s2geometry/build.sh
@@ -16,7 +16,6 @@
 ################################################################################
 
 cp $SRC/s2_fuzzer.cc $SRC/s2geometry/src/
-export CXXFLAGS="${CXXFLAGS} -std=c++17"
 
 cd $SRC/
 git clone --depth=1 https://github.com/abseil/abseil-cpp
diff --git a/projects/s2geometry/project.patch b/projects/s2geometry/project.patch
index ca2e1c20a..45e49b399 100644
--- a/projects/s2geometry/project.patch
+++ b/projects/s2geometry/project.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 2d2b233..6b52d22 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -418,6 +418,20 @@ install(TARGETS s2 s2testing
+@@ -418,6 +418,22 @@ install(TARGETS s2 s2testing
          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
  
@@ -17,7 +17,9 @@ index 2d2b233..6b52d22 100644
 +  absl::flags_reflection
 +  absl::memory
 +  absl::span
++  absl::str_format
 +  absl::strings
++  absl::utility
 +  absl::synchronization)
 +
  message("GTEST_ROOT: ${GTEST_ROOT}")
diff --git a/projects/s2geometry/s2_fuzzer.cc b/projects/s2geometry/s2_fuzzer.cc
index 355c9db92..e19b0cc8c 100644
--- a/projects/s2geometry/s2_fuzzer.cc
+++ b/projects/s2geometry/s2_fuzzer.cc
@@ -88,7 +88,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     return 0;
   }
   if (isValidFormat(nt_string, size)) {
-    auto index = s2textformat::MakeIndex(nt_string);
+    auto index = absl::make_unique<MutableS2ShapeIndex>();
+    s2textformat::MakeIndex(nt_string, &index);
     s2shapeutil::RangeIterator it(*index);
     if (!it.done()) {
       it.Next();