diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fccfd869d..fe03208910 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -212,6 +212,7 @@ jobs:
       - run: ./automation/tests.py rust-fmt
   Lint Rust with clippy:
     executor: docker
+    resource_class: large
     steps:
       - full-checkout
       - restore-sccache-cache
@@ -230,7 +231,7 @@ jobs:
   Rust tests:
     executor: docker
     # We have to use a machine with more RAM for tests so we don't run out of memory.
-    resource_class: large
+    resource_class: xlarge
     steps:
       - full-checkout
       - restore-sccache-cache
@@ -240,7 +241,7 @@ jobs:
   Rust tests - min supported rust version:
     executor: docker
     # We have to use a machine with more RAM for tests so we don't run out of memory.
-    resource_class: large
+    resource_class: xlarge
     steps:
       - full-checkout
       - restore-sccache-cache
diff --git a/Cargo.lock b/Cargo.lock
index e5bbea3b89..390bab124d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4892,7 +4892,7 @@ checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 [[package]]
 name = "uniffi"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "camino",
@@ -4920,7 +4920,7 @@ dependencies = [
 [[package]]
 name = "uniffi_bindgen"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "askama",
@@ -4945,7 +4945,7 @@ dependencies = [
 [[package]]
 name = "uniffi_build"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "camino",
@@ -4955,7 +4955,7 @@ dependencies = [
 [[package]]
 name = "uniffi_core"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "bytes",
@@ -4966,7 +4966,7 @@ dependencies = [
 [[package]]
 name = "uniffi_internal_macros"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "indexmap 2.5.0",
@@ -4978,7 +4978,7 @@ dependencies = [
 [[package]]
 name = "uniffi_macros"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "camino",
  "fs-err",
@@ -4994,7 +4994,7 @@ dependencies = [
 [[package]]
 name = "uniffi_meta"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -5005,7 +5005,7 @@ dependencies = [
 [[package]]
 name = "uniffi_pipeline"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "heck",
@@ -5017,7 +5017,7 @@ dependencies = [
 [[package]]
 name = "uniffi_udl"
 version = "0.31.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -5380,7 +5380,7 @@ dependencies = [
 [[package]]
 name = "weedle2"
 version = "5.0.0"
-source = "git+https://github.com/mozilla/uniffi-rs.git?rev=106e12ae2a0474a1880667ed3a4b050fcf1c6666#106e12ae2a0474a1880667ed3a4b050fcf1c6666"
+source = "git+https://github.com/mozilla/uniffi-rs.git?rev=59b035078322fbc0a605cc3c784cc38214113450#59b035078322fbc0a605cc3c784cc38214113450"
 dependencies = [
  "nom",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 841d8c00fe..ad07d4126f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -156,6 +156,6 @@ lto = "thin"
 
 [patch.crates-io]
 # uniffi is using an experimental ffi based on 0.31.
-uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
-uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
-uniffi_pipeline = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "106e12ae2a0474a1880667ed3a4b050fcf1c6666" }
+uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "59b035078322fbc0a605cc3c784cc38214113450" }
+uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "59b035078322fbc0a605cc3c784cc38214113450" }
+uniffi_pipeline = { git = "https://github.com/mozilla/uniffi-rs.git", rev = "59b035078322fbc0a605cc3c784cc38214113450" }