diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java b/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
index 0b9f26cb71b..2bb4a018c30 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cli/Bootstrap.java
@@ -153,13 +153,6 @@ public static void main(final String[] args) throws Exception {
         try (final URLClassLoader loader = setupClasspath()) {
             setupHome(args);
 
-            if (loader != null) {
-                Thread.currentThread().setContextClassLoader(loader);
-                if (loader != ClassLoader.getSystemClassLoader()) {
-                    System.setProperty("openejb.classloader.first.disallow-system-loading", "true");
-                }
-            }
-
             final Class<?> clazz = (loader == null ? Bootstrap.class.getClassLoader() : loader).loadClass(OPENEJB_CLI_MAIN_CLASS_NAME);
 
             final Object main = clazz.getConstructor().newInstance();