Merge branch '2020-10-23-revert-xen-changes'