Index: common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java
===================================================================
--- common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java	(revision 83121)
+++ common/src/main/java/org/jboss/ejb3/common/resolvers/plugins/FirstMatchEjbReferenceResolver.java	(working copy)
@@ -64,7 +64,7 @@
       String jndiName = null;
 
       // Resolve from the root deployment
-      DeploymentUnit root = this.getRoot(du);
+      DeploymentUnit root = du.getTopLevel();
       jndiName = this.resolveEjbFromRoot(root, reference);
 
       // Check that we could resolve
Index: common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java
===================================================================
--- common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java	(revision 83121)
+++ common/src/main/java/org/jboss/ejb3/common/resolvers/spi/EjbReferenceResolverBase.java	(working copy)
@@ -388,16 +388,4 @@
 
    }
 
-   /**
-    * Obtains the root deployment unit 
-    * 
-    * @param du
-    * @return
-    */
-   protected DeploymentUnit getRoot(DeploymentUnit du)
-   {
-      // Recurse until we hit the root
-      return du.getParent() == null ? du : this.getRoot(du.getParent());
-   }
-
 }