diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java
index 740717551e64..4ffbdbbb439f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java
@@ -40,7 +40,7 @@ public final class CleanLifecycleProvider
         "post-clean"
     };
 
-    private static final String MAVEN_CLEAN_PLUGIN_VERSION = "4.0.0-SNAPSHOT";
+    private static final String MAVEN_CLEAN_PLUGIN_VERSION = "3.1.0";
 
     private static final String[] BINDINGS = {
         "clean", "org.apache.maven.plugins:maven-clean-plugin:" + MAVEN_CLEAN_PLUGIN_VERSION + ":clean"
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index fc12b121ded6..a14f891059d2 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -650,7 +650,7 @@ private void populateMojoExecutionFields( Object mojo, String executionId, MojoD
 
         if ( StringUtils.isEmpty( configuratorId ) )
         {
-            configuratorId = "enhanced";
+            configuratorId = "basic";
         }
 
         try