diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index bd67a1a4d8..2d174443cd 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -713,7 +713,8 @@ public class DefaultPluginManager
 
             if ( oldLookupRealm != null )
             {
-                container.setLookupRealm( oldLookupRealm );
+                //container.setLookupRealm( oldLookupRealm );
+                container.setLookupRealm( null );
             }
 
             Thread.currentThread().setContextClassLoader( oldClassLoader );
diff --git a/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java b/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java
index 2bd204b88a..9dc9543248 100644
--- a/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java
+++ b/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java
@@ -1,17 +1,16 @@
 package org.apache.maven.project.builder.listeners;
 
-import org.apache.maven.shared.model.ModelEventListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.maven.project.builder.ArtifactModelContainerFactory;
+import org.apache.maven.project.builder.ProjectUri;
 import org.apache.maven.shared.model.ModelContainer;
 import org.apache.maven.shared.model.ModelContainerFactory;
+import org.apache.maven.shared.model.ModelEventListener;
 import org.apache.maven.shared.model.ModelProperty;
-import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.ArtifactModelContainerFactory;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Collection;
-import java.util.Arrays;
-import java.util.ArrayList;
 
 public class BuildExtensionListener
     implements ModelEventListener