diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalEjbReceiver.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalEjbReceiver.java
index b8aeb0f..76d779d 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalEjbReceiver.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalEjbReceiver.java
@@ -210,7 +210,7 @@
         }
 
         final ClonerConfiguration config = new ClonerConfiguration();
-        config.setClassCloner(new LocalInvocationClassCloner(WildFlySecurityManager.getClassLoaderPrivileged(invocation.getInvokedProxy().getClass())));
+        config.setClassCloner(new ClassLoaderClassCloner(WildFlySecurityManager.getCurrentContextClassLoaderPrivileged()));
         final ObjectCloner resultCloner = createCloner(config);
         if (async) {
             if (ejbComponent instanceof SessionBeanComponent) {
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalInvocationClassCloner.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalInvocationClassCloner.java
deleted file mode 100644
index 97a4604..0000000
--- a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalInvocationClassCloner.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.as.ejb3.remote;
-
-import java.io.IOException;
-import java.lang.reflect.Proxy;
-
-import org.jboss.marshalling.cloner.ClassCloner;
-
-/**
- * {@link ClassCloner} that clones classes between class loaders, falling back
- * to original class if it cannot be found in the destination class loader.
- *
- * @author Stuart Douglas
- */
-public class LocalInvocationClassCloner implements ClassCloner {
-
-    private final ClassLoader destClassLoader;
-
-    public LocalInvocationClassCloner(final ClassLoader destClassLoader) {
-        this.destClassLoader = destClassLoader;
-    }
-
-    public Class<?> clone(final Class<?> original) throws IOException, ClassNotFoundException {
-        final String name = original.getName();
-        if (name.startsWith("java.")) {
-            return original;
-        } else if (original.getClassLoader() == destClassLoader) {
-            return original;
-        } else {
-            try {
-                return Class.forName(name, true, destClassLoader);
-            } catch (ClassNotFoundException e) {
-                return original;
-            }
-        }
-    }
-
-    public Class<?> cloneProxy(final Class<?> proxyClass) throws IOException, ClassNotFoundException {
-        final Class<?>[] origInterfaces = proxyClass.getInterfaces();
-        final Class<?>[] interfaces = new Class[origInterfaces.length];
-        for (int i = 0, origInterfacesLength = origInterfaces.length; i < origInterfacesLength; i++) {
-            interfaces[i] = clone(origInterfaces[i]);
-        }
-        return Proxy.getProxyClass(destClassLoader, interfaces);
-    }
-}