diff --git a/src/main/perl/Partition.pm b/src/main/perl/Partition.pm
index ec073e2..90ab4d9 100644
--- a/src/main/perl/Partition.pm
+++ b/src/main/perl/Partition.pm
@@ -625,10 +625,9 @@ sub create_pre_ks
     # make sure this never matches on anything else
     $extended_txt .= "_no_msdos_label" if ($self->{holding_dev}->{label} ne MSDOS);
 
-    # Avoid LVM/mdadm/etc. autodiscovery kicking in after the partition has
-    # been created
-    my $pause_udev = $self->{anaconda_version} >= ANACONDA_VERSION_EL_7_0 ? "udevadm control --stop-exec-queue" : "";
-    my $unpause_udev = $self->{anaconda_version} >= ANACONDA_VERSION_EL_7_0 ? "udevadm control --start-exec-queue" : "";
+    # Avoid LVM/mdadm/etc. autodiscovery kicking in after the partition has been created
+    my $mask_udev_rules = $self->{anaconda_version} >= ANACONDA_VERSION_EL_7_0 ? "find /usr/lib/udev/rules.d/ -type f -name \*.rules | grep -E '(dm|lvm)' | xargs basename -a | xargs -I@ touch /etc/udev/rules.d/@" : "";
+    my $unmask_udev_rules = $self->{anaconda_version} >= ANACONDA_VERSION_EL_7_0 ? "rm -f /etc/udev/rules.d/*.rules" : "";
 
     print <<EOF;
 if ! grep -q '$self->{devname}\$' /proc/partitions
@@ -676,7 +675,7 @@ EOF
     }
     print <<EOF;
     $end_txt
-    $pause_udev
+    $mask_udev_rules
     parted $disk -s -- u s mkpart $self->{type} \$begin \$end
     while true; do
         sleep 1
@@ -692,7 +691,7 @@ EOF
     }
 
     print <<EOF;
-    $unpause_udev
+    $unmask_udev_rules
     udevadm settle
 EOF