diff --git a/vm-init.d/qubes-core.modules b/vm-init.d/qubes-core.modules
index 7524c06..94362f3 100755
--- a/vm-init.d/qubes-core.modules
+++ b/vm-init.d/qubes-core.modules
@@ -1,5 +1,4 @@
-modprobe evtchn 2>/dev/null || modprobe xen-evtchn
+modprobe xen-evtchn 2>/dev/null || modprobe evtchn
 modprobe xen-blkback 2> /dev/null || modprobe blkbk
-modprobe u2mfn 2>/dev/null
 modprobe xen-gntalloc 2> /dev/null
 modprobe xen-gntdev 2> /dev/null
diff --git a/vm-systemd/qubes-core.conf b/vm-systemd/qubes-core.conf
index 538a1db..5dcfc0e 100644
--- a/vm-systemd/qubes-core.conf
+++ b/vm-systemd/qubes-core.conf
@@ -1,6 +1,5 @@
 xen-evtchn
 xen-blkback
-u2mfn
 xen-gntalloc
 xen-gntdev
 xen-privcmd