Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -3130,6 +3130,11 @@ class XendDomainInfo:
         self._cleanup_phantom_devs(paths)
         self._cleanupVm()
 
+        if "change_home_server" in self.info:
+            chs = self.info["change_home_server"]
+            if (type(chs) is str and chs == "False") or \
+               (type(chs) is bool and chs is False):
+                self.setChangeHomeServer(None)
         if ("transient" in self.info["other_config"] and \
             bool(self.info["other_config"]["transient"])) or \
            ("change_home_server" in self.info and \