diff --git a/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java b/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
index 2990eb1baa..70dc0fd1b3 100644
--- a/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
+++ b/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
@@ -340,31 +340,6 @@ public class DefaultProjectErrorReporter
         registerBuildError( cause, writer.toString() );
     }
 
-    public void reportBadNonDependencyProjectArtifactVersion( MavenProject project,
-                                                              File pomFile,
-                                                              InvalidProjectVersionException cause )
-    {
-        StringWriter writer = new StringWriter();
-
-        writer.write( NEWLINE );
-        writer.write( "You have an invalid version in your POM:" );
-        writer.write( NEWLINE );
-        writer.write( NEWLINE );
-        writer.write( "Location: " );
-        writer.write( cause.getLocationInPom() );
-        writer.write( NEWLINE );
-        writer.write( NEWLINE );
-        writer.write( "Reason: " );
-        writer.write( cause.getMessage() );
-        writer.write( NEWLINE );
-
-        addStandardInfo( project.getId(), pomFile, writer );
-        addTips( ProjectErrorTips.getTipsForBadNonDependencyArtifactSpec( project, pomFile, cause ),
-                 writer );
-
-        registerBuildError( cause, writer.toString() );
-    }
-
 
     public void reportProjectValidationFailure( MavenProject project,
                                                 File pomFile,
diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 30422f6ea4..d5fcdc083e 100644
--- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -637,22 +637,7 @@ public class DefaultMavenProjectBuilder
         ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(domainModel.getModelProperties(),
                 PomTransformer.MODEL_CONTAINER_FACTORIES), activeProfileIds, inactiveProfileIds, properties);
 
-        Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles();
-
-        for(ModelContainer mc : profileContainers)
-        {
-            List<ModelProperty> transformed = new ArrayList<ModelProperty>();
-            for(ModelProperty mp : mc.getProperties())
-            {
-                if(mp.getUri().startsWith(ProjectUri.Profiles.Profile.xUri) && !mp.getUri().equals(ProjectUri.Profiles.Profile.id)
-                        && !mp.getUri().startsWith(ProjectUri.Profiles.Profile.Activation.xUri) )
-                {
-                    transformed.add(new ModelProperty(mp.getUri().replace(ProjectUri.Profiles.Profile.xUri, ProjectUri.xUri),
-                            mp.getResolvedValue()));
-                }
-            }
-            domainModels.add(new PomClassicDomainModel(transformed, false));
-        }
+        domainModels.addAll( transformProfiles(profileContext) );
         domainModels.add( domainModel );
         
         File parentFile = null;
@@ -840,6 +825,16 @@ public class DefaultMavenProjectBuilder
         //Process Profiles
         ProfileContext profileContext = new ProfileContext(new DefaultModelDataSource(parentDomainModel.getModelProperties(),
                 PomTransformer.MODEL_CONTAINER_FACTORIES), activeProfileIds, inactiveProfileIds, properties);
+        domainModels.addAll( transformProfiles(profileContext) );
+
+        domainModels.addAll( getDomainModelParentsFromRepository( parentDomainModel, localRepository, remoteRepositories, properties,
+                                                                  activeProfileIds, inactiveProfileIds ) );
+        return domainModels;
+    }
+    
+    private static List<DomainModel> transformProfiles( ProfileContext profileContext ) throws IOException
+    {
+        List<DomainModel> domainModels = new ArrayList<DomainModel>();
         Collection<ModelContainer> profileContainers = profileContext.getActiveProfiles();
 
         for(ModelContainer mc : profileContainers)
@@ -857,10 +852,7 @@ public class DefaultMavenProjectBuilder
             }
 
             domainModels.add(new PomClassicDomainModel(transformed));
-        }
-
-        domainModels.addAll( getDomainModelParentsFromRepository( parentDomainModel, localRepository, remoteRepositories, properties,
-                                                                  activeProfileIds, inactiveProfileIds ) );
+        }   
         return domainModels;
     }