diff --git a/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java b/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
index ebdf9b72..2c6dd86d 100644
--- a/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
+++ b/src/main/java/com/zaxxer/hikari/proxy/JavassistProxyFactory.java
@@ -49,11 +49,8 @@ public final class JavassistProxyFactory
 
     static
     {
-    	ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try
         {
-        	Thread.currentThread().setContextClassLoader(JavassistProxyFactory.class.getClassLoader());
-        	
         	JavassistProxyFactory proxyFactoryFactory = new JavassistProxyFactory();
         	proxyFactoryFactory.modifyProxyFactory();
         }
@@ -61,10 +58,6 @@ public final class JavassistProxyFactory
         {
         	throw new RuntimeException(e);
         }
-        finally
-        {
-        	Thread.currentThread().setContextClassLoader(contextClassLoader);
-        }
     }
 
     /**