diff --git a/fastx_programmability/adapter/Cargo.toml b/fastx_programmability/adapter/Cargo.toml
index 882728af05c70..417339fa7d298 100644
--- a/fastx_programmability/adapter/Cargo.toml
+++ b/fastx_programmability/adapter/Cargo.toml
@@ -12,13 +12,6 @@ anyhow = "1.0.38"
 bcs = "0.1.2"
 structopt = "0.3.21"
 
-## uncomment for debugging with local copy of diem repo
-# move-binary-format = { path = "../../../diem/language/move-binary-format" }
-# move-bytecode-utils = { path = "../../../diem/language/tools/move-bytecode-utils" }
-# move-core-types = { path = "../../../diem/language/move-core/types" }
-# move-cli = { path = "../../../diem/language/tools/move-cli" }
-# move-vm-runtime = { path = "../../../diem/language/move-vm/runtime" }
-
 move-binary-format = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
 move-bytecode-utils = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
 move-core-types = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
diff --git a/fastx_programmability/framework/Cargo.toml b/fastx_programmability/framework/Cargo.toml
index a233368f2f057..ce8958bd9984d 100644
--- a/fastx_programmability/framework/Cargo.toml
+++ b/fastx_programmability/framework/Cargo.toml
@@ -10,15 +10,6 @@ publish = false
 [dependencies]
 smallvec = "1.6.1"
 
-## uncomment for debugging with local copy of diem repo
-# move-binary-format = { path = "../../../diem/language/move-binary-format" }
-# move-core-types = { path = "../../../diem/language/move-core/types" }
-# move-lang = { path = "../../../diem/language/move-lang" }
-# move-package = { path = "../../../diem/language/move-package" }
-# move-stdlib = { path = "../../../diem/language/move-stdlib" }
-# move-vm-runtime = { path = "../../../diem/language/move-vm/runtime" }
-# move-vm-types = { path = "../../../diem/language/move-vm/types" }
-
 move-binary-format = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
 move-core-types = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
 move-lang = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
diff --git a/fastx_programmability/verifier/Cargo.toml b/fastx_programmability/verifier/Cargo.toml
index 3d59ae5ecd587..4b0450d8030ad 100644
--- a/fastx_programmability/verifier/Cargo.toml
+++ b/fastx_programmability/verifier/Cargo.toml
@@ -8,10 +8,6 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-## uncomment for debugging with local copy of diem repo
-# move-binary-format = { path = "../../../diem/language/move-binary-format" }
-# move-core-types = { path = "../../../diem/language/move-core/types" }
-
 move-binary-format = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
 move-core-types = { git = "https://github.com/diem/diem", rev="661a2d1367a64a02027e4ed8f4b18f0a37cfaa17" }
 
diff --git a/scripts/diem_dependency.py b/scripts/diem_dependency.py
new file mode 100644
index 0000000000000..68cb7758959af
--- /dev/null
+++ b/scripts/diem_dependency.py
@@ -0,0 +1,93 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# SPDX-License-Identifier: Apache-2.0
+
+import argparse
+import os
+import re
+
+CURRENT_REV = "661a2d1367a64a02027e4ed8f4b18f0a37cfaa17"
+ROOT = os.path.join(os.path.dirname(__file__), "../")
+PATTERN = re.compile(
+    '(\s*)(.+) = {{ git = "https://github.com/diem/diem", rev="{}" }}(\s*)'.format(
+        CURRENT_REV
+    )
+)
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    subparser = parser.add_subparsers(
+        dest="command",
+        description="""
+    Automatically manage the dependency path to Diem repository.
+    Command "local" switches the dependency from git to local path.
+    Command "upgrade" upgrades the git revision.
+    """,
+    )
+    local = subparser.add_parser("local")
+    remote = subparser.add_parser("remote")
+    upgrade = subparser.add_parser("upgrade")
+    upgrade.add_argument("--rev", type=str, required=True)
+    return parser.parse_args()
+
+
+def scan_file(file, process_line, depth=0):
+    new_content = []
+    with open(file) as f:
+        for line in f.readlines():
+            new_content.append(process_line(line, depth))
+    with open(file, "w") as f:
+        f.writelines(new_content)
+
+
+def scan_files(path, process_line, depth=0):
+    for file in os.listdir(path):
+        full_path = os.path.join(path, file)
+        if os.path.isdir(full_path):
+            scan_files(full_path, process_line, depth + 1)
+        elif file == "Cargo.toml":
+            scan_file(full_path, process_line, depth)
+
+
+def switch_to_local():
+    # Packages that don't directly map to a directory under diem/language
+    # go here as special cases. By default, we just use language/[name].
+    path_map = {
+        "move-bytecode-utils": "tools/move-bytecode-utils",
+        "move-cli": "tools/move-cli",
+        "move-core-types": "move-core/types",
+        "move-package": "tools/move-package",
+        "move-vm-runtime": "move-vm/runtime",
+        "move-vm-types": "move-vm/types",
+    }
+
+    def process_line(line, depth):
+        m = PATTERN.match(line)
+        if m:
+            prefix = m.group(1)
+            name = m.group(2)
+            postfix = m.group(3)
+            go_back = "".join(["../"] * (depth + 1))
+            return '{}{} = {{ path = "{}diem/language/{}" }}{}'.format(
+                prefix, name, go_back, path_map.get(name, name), postfix
+            )
+        return line
+
+    scan_files(ROOT, process_line)
+
+
+def upgrade_revision(rev):
+    def process_line(line, _):
+        return line.replace(CURRENT_REV, rev)
+
+    scan_files(ROOT, process_line)
+    # Also patch the script itself with the new revision.
+    scan_file(__file__, process_line)
+
+
+args = parse_args()
+if args.command == "local":
+    switch_to_local()
+else:
+    assert args.command == "upgrade"
+    upgrade_revision(args.rev)
\ No newline at end of file