diff --git a/recipe_modules/txt_roll/__init__.py b/recipe_modules/txt_roll/__init__.py
index caa1849..1c57574 100644
--- a/recipe_modules/txt_roll/__init__.py
+++ b/recipe_modules/txt_roll/__init__.py
@@ -17,9 +17,9 @@
 from __future__ import annotations
 
 DEPS = [
+    'fuchsia/git_roll_util',
     'pigweed/checkout',
     'pigweed/roll_util',
-    'recipe_engine/buildbucket',
     'recipe_engine/file',
     'recipe_engine/path',
     'recipe_engine/step',
diff --git a/recipe_modules/txt_roll/api.py b/recipe_modules/txt_roll/api.py
index 26cefed..d879fb1 100644
--- a/recipe_modules/txt_roll/api.py
+++ b/recipe_modules/txt_roll/api.py
@@ -41,31 +41,11 @@
     ) -> dict[str, roll_util_api.Roll] | None:
         branch = txt_entry.branch or 'main'
 
-        new_revision: Optional[str] = None
-
-        # First, try to get new_revision from the trigger.
-        bb_remote: Optional[str] = None
-        commit = self.m.buildbucket.build.input.gitiles_commit
-        if commit and commit.project:
-            new_revision = commit.id
-            host = commit.host
-            bb_remote = f'https://{host}/{commit.project}'
-
-        # If we still don't have a revision then it wasn't in the trigger.
-        # (Perhaps this was manually triggered.) In this case we update to the
-        # property-specified branch HEAD.
-        if new_revision is None:
-            new_revision = branch
-
-        # If this was triggered by a gitiles poller, check that the triggering
-        # repository matches project_remote.
-
-        if bb_remote:
-            if not checkout.remotes_equivalent(txt_entry.remote, bb_remote):
-                raise self.m.step.StepFailure(
-                    'triggering repository ({}) does not match project remote '
-                    '({})'.format(bb_remote, txt_entry.remote)
-                )
+        new_revision = self.m.git_roll_util.resolve_new_revision(
+            txt_entry.remote,
+            branch,
+            checkout.remotes_equivalent,
+        )
 
         project_dir = self.m.path.start_dir / 'project'
 
diff --git a/recipe_modules/txt_roll/tests/full.expected/backwards.json b/recipe_modules/txt_roll/tests/full.expected/backwards.json
index f0a23b8..fb33211 100644
--- a/recipe_modules/txt_roll/tests/full.expected/backwards.json
+++ b/recipe_modules/txt_roll/tests/full.expected/backwards.json
@@ -1,5 +1,20 @@
 [
   {
+    "cmd": [
+      "git",
+      "ls-remote",
+      "--heads",
+      "https://foo.googlesource.com/foo",
+      "main"
+    ],
+    "name": "git ls-remote",
+    "timeout": 600.0,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@stdout@h3ll0\trefs/heads/main@@@",
+      "@@@STEP_LOG_END@stdout@@@"
+    ]
+  },
+  {
     "cmd": [],
     "name": "checkout foo",
     "~followup_annotations": [
diff --git a/recipe_modules/txt_roll/tests/full.expected/bad-trigger.json b/recipe_modules/txt_roll/tests/full.expected/bad-trigger.json
deleted file mode 100644
index cf949bf..0000000
--- a/recipe_modules/txt_roll/tests/full.expected/bad-trigger.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "failure": {
-      "failure": {},
-      "humanReason": "triggering repository (https://foo.googlesource.com/bar) does not match project remote (https://foo.googlesource.com/foo)"
-    },
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipe_modules/txt_roll/tests/full.py b/recipe_modules/txt_roll/tests/full.py
index b2225e3..def037a 100644
--- a/recipe_modules/txt_roll/tests/full.py
+++ b/recipe_modules/txt_roll/tests/full.py
@@ -75,13 +75,6 @@
     )
 
     yield api.test(
-        'bad-trigger',
-        properties(api.txt_roll.entry(path='foo.txt', remote=_url("foo"))),
-        trigger('bar'),
-        status='FAILURE',
-    )
-
-    yield api.test(
         'backwards',
         properties(api.txt_roll.entry(path='foo.txt', remote=_url("foo"))),
         api.roll_util.backward_roll(),