diff --git a/grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy b/grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy
index 702bf67561..9c9a801523 100644
--- a/grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy
+++ b/grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy
@@ -21,17 +21,13 @@ import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.control.customizers.ImportCustomizer
-import org.springframework.boot.ApplicationContextFactory
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.core.io.ResourceLoader
-import org.springframework.util.ClassUtils
 
 import grails.binding.GroovyShellBindingCustomizer
 import grails.boot.Grails
 import grails.core.GrailsApplication
 import grails.persistence.support.PersistenceContextInterceptor
-import grails.ui.console.support.GroovyConsoleApplicationContext
-import grails.ui.console.support.GroovyConsoleWebApplicationContext
 import grails.util.GrailsVersion
 
 /**
@@ -49,21 +45,10 @@ class GrailsConsole extends Grails {
 
     GrailsConsole(Class<?>... sources) {
         super(sources)
-        configureApplicationContextClass()
     }
 
     GrailsConsole(ResourceLoader resourceLoader, Class<?>... sources) {
         super(resourceLoader, sources)
-        configureApplicationContextClass()
-    }
-
-    void configureApplicationContextClass() {
-        if (ClassUtils.isPresent('javax.servlet.ServletContext', Thread.currentThread().contextClassLoader)) {
-            setApplicationContextFactory(ApplicationContextFactory.ofContextClass(GroovyConsoleWebApplicationContext))
-        }
-        else {
-            setApplicationContextFactory(ApplicationContextFactory.ofContextClass(GroovyConsoleApplicationContext))
-        }
     }
 
     @Override
diff --git a/grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy b/grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy
index e9f275eae5..bc50ac8f08 100644
--- a/grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy
+++ b/grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy
@@ -21,17 +21,13 @@ import org.apache.groovy.groovysh.Groovysh
 import org.apache.groovy.groovysh.InteractiveShellRunner
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.shell.IO
-import org.springframework.boot.ApplicationContextFactory
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.core.io.ResourceLoader
-import org.springframework.util.ClassUtils
 
 import grails.binding.GroovyShellBindingCustomizer
 import grails.boot.Grails
 import grails.core.GrailsApplication
 import grails.persistence.support.PersistenceContextInterceptor
-import grails.ui.shell.support.GroovyshApplicationContext
-import grails.ui.shell.support.GroovyshWebApplicationContext
 
 /**
  * A Shell
@@ -53,21 +49,10 @@ class GrailsShell extends Grails {
 
     GrailsShell(Class<?>... sources) {
         super(sources)
-        configureApplicationContextClass()
     }
 
     GrailsShell(ResourceLoader resourceLoader, Class<?>... sources) {
         super(resourceLoader, sources)
-        configureApplicationContextClass()
-    }
-
-    private void configureApplicationContextClass() {
-        if (ClassUtils.isPresent('javax.servlet.ServletContext', Thread.currentThread().contextClassLoader)) {
-            setApplicationContextFactory(ApplicationContextFactory.ofContextClass(GroovyshWebApplicationContext))
-        }
-        else {
-            setApplicationContextFactory(ApplicationContextFactory.ofContextClass(GroovyshApplicationContext))
-        }
     }
 
     @Override