diff --git a/lib/galaxy/tools/toolbox/lineages/factory.py b/lib/galaxy/tools/toolbox/lineages/factory.py
index f3b42ce8516..cc67d45b731 100644
--- a/lib/galaxy/tools/toolbox/lineages/factory.py
+++ b/lib/galaxy/tools/toolbox/lineages/factory.py
@@ -8,8 +8,8 @@ def remove_version_from_guid( guid ):
     """
     if "/repos/" not in guid:
         return None
-    tool_version = guid.split("/")[-1]
-    return guid.split(tool_version)[0]
+    last_slash = guid.rfind('/')
+    return guid[:last_slash]
 
 
 class LineageMap(object):