diff --git a/python/xref2vtysh.py b/python/xref2vtysh.py
index 1760588ca8..91ccba64f0 100644
--- a/python/xref2vtysh.py
+++ b/python/xref2vtysh.py
@@ -324,17 +324,7 @@ class CommandEntry:
     def load(cls, xref):
         nodes = NodeDict()
 
-        mgmtname = "mgmtd/libmgmt_be_nb.la"
         for cmd_name, origins in xref.get("cli", {}).items():
-            # If mgmtd has a yang version of a CLI command, make it the only daemon
-            # to handle it.  For now, daemons can still be compiling their cmds into the
-            # binaries to allow for running standalone with CLI config files. When they
-            # do this they will also be present in the xref file, but we want to ignore
-            # those in vtysh.
-            if "yang" in origins.get(mgmtname, {}).get("attrs", []):
-                CommandEntry.process(nodes, cmd_name, mgmtname, origins[mgmtname])
-                continue
-
             for origin, spec in origins.items():
                 CommandEntry.process(nodes, cmd_name, origin, spec)
         return nodes
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index 95f79564af..05f23f54d1 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -1696,8 +1696,7 @@ void static_vty_init(void)
 	install_element(CONFIG_NODE, &debug_staticd_cmd);
 	install_element(ENABLE_NODE, &show_debugging_static_cmd);
 	install_element(ENABLE_NODE, &staticd_show_bfd_routes_cmd);
-#endif /* ifndef INCLUDE_MGMTD_CMDDEFS_ONLY */
-
+#else /* else INCLUDE_MGMTD_CMDDEFS_ONLY */
 	install_element(CONFIG_NODE, &ip_mroute_dist_cmd);
 
 	install_element(CONFIG_NODE, &ip_route_blackhole_cmd);
@@ -1713,6 +1712,7 @@ void static_vty_init(void)
 	install_element(VRF_NODE, &ipv6_route_address_interface_vrf_cmd);
 	install_element(CONFIG_NODE, &ipv6_route_cmd);
 	install_element(VRF_NODE, &ipv6_route_vrf_cmd);
+#endif /* ifndef INCLUDE_MGMTD_CMDDEFS_ONLY */
 
 #ifndef INCLUDE_MGMTD_CMDDEFS_ONLY
 	mgmt_be_client_lib_vty_init();