diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 0e6b7844161..d637de34e2f 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2537,6 +2537,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
         // snapshots dir fails, let Ready command
         // succeed.
         callHostPlugin(conn, "vmopsSnapshot", "unmountSnapshotsDir", "dcId", dcId.toString());
+        
+        setupLinkLocalNetwork(conn);
        
         _localGateway = callHostPlugin(conn, "vmops", "getgateway", "mgmtIP", _host.ip);
         if (_localGateway == null || _localGateway.isEmpty()) {
diff --git a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
index 3d8d9f933fc..c2b2426ac33 100755
--- a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
+++ b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh
@@ -27,20 +27,6 @@ do
   done
 done
 
-
-# propagates local link network
-local_networkname="cloud_link_local_network"
-local_network=$(xe network-list name-label=$local_networkname --minimal)
-for dom0 in $(xe vm-list is-control-domain=true | grep ^uuid | awk '{print $NF}')
-do
-  local_vif=$(xe vif-list vm-uuid=$dom0 network-name-label=$local_networkname | grep ^uuid | awk '{print $NF}')
-  if [ -z $local_vif ]; then
-      local_vif=$(xe vif-create network-uuid=$local_network vm-uuid=$dom0 device=0 mac=fe:ff:ff:ff:ff:ff)
-      xe vif-param-set uuid=$local_vif other-config:nameLabel=link_local_network_vif
-      xe vif-plug uuid=$local_vif
-  fi
-done
-
 # eject all CD