diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
index 7bebb4fe2c..658652c3aa 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -164,22 +164,14 @@ subnet 10.5.124.128 netmask 255.255.255.128 {
     option routers 10.5.124.254;
 
     range 10.5.124.240 10.5.124.249;
-
- class "pxeclients" {
-      match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
-      next-server 10.5.126.41;
-
-      if option arch = 00:07 {
-        filename "EFI/shim.efi";
-        } else {
-        filename "pxelinux.0";
-      }
-    }
+    next-server 10.5.126.41;
 
     host retrace03 {
          hardware ethernet ec:f4:bb:c0:38:a0;
 	 fixed-address 10.5.124.230;
 	 option host-name "retrace03.qa.fedoraproject.org";
+         next-server 10.5.126.41;
+         filename "EFI/shim.efi";
      }