--- xnu/xnu-792.25.20/iokit/bsddev/IOKitBSDInit.cpp
+++ xnu/xnu-792.2.4/iokit/bsddev/IOKitBSDInit.cpp
@@ -465,14 +465,6 @@
 
     do {
 	if( (regEntry = IORegistryEntry::fromPath( "/chosen", gIODTPlane ))) {
-            data = OSDynamicCast(OSData, regEntry->getProperty( "root-matching" ));
-            if (data) {
-               matching = OSDynamicCast(OSDictionary, OSUnserializeXML((char *)data->getBytesNoCopy()));
-                if (matching) {
-                    continue;
-                }
-            }
-
 	    data = (OSData *) regEntry->getProperty( "boot-uuid" );
 	    if( data) {
 		uuidStr = (const char*)data->getBytesNoCopy();
@@ -572,12 +564,10 @@
 	// from OpenFirmware path
 	IOLog("From path: \"%s\", ", look);
 
-        if (!matching) {
-            if( forceNet || (0 == strncmp( look, "enet", strlen( "enet" ))) ) {
-                matching = IONetworkMatching( look, str, kMaxPathBuf );
-            } else {
-                matching = IODiskMatching( look, str, kMaxPathBuf );
-            }
+	if( forceNet || (0 == strncmp( look, "enet", strlen( "enet" ))) ) {
+            matching = IONetworkMatching( look, str, kMaxPathBuf );
+        } else {
+            matching = IODiskMatching( look, str, kMaxPathBuf );
         }
     }
     
@@ -679,7 +669,7 @@
         IOService * subservice = IOFindMatchingChild( service );
         if ( subservice ) service = subservice;
     } else if ( service && mediaProperty ) {
-        service = (IOService *)service->getProperty(mediaProperty);
+        service = service->getProperty(mediaProperty);
     }
 
     major = 0;