diff --git a/dd-java-agent/instrumentation/spring-web/spring-web.gradle b/dd-java-agent/instrumentation/spring-web/spring-web.gradle
index 288a205b0c..f49d1df329 100644
--- a/dd-java-agent/instrumentation/spring-web/spring-web.gradle
+++ b/dd-java-agent/instrumentation/spring-web/spring-web.gradle
@@ -1,15 +1,11 @@
-//apply plugin: 'version-scan'
-//
-//versionScan {
-//  group = 'org.springframework'
-//  module = 'spring-webmvc'
-//  legacyModule = "servlet-api"
-//  versions = "[3.0,)"
-//  verifyPresent = [
-//    "javax.servlet.AsyncEvent"   : null,
-//    "javax.servlet.AsyncListener": null,
-//  ]
-//}
+muzzle {
+  pass {
+    group = 'org.springframework'
+    module = 'javax.servlet.api'
+    versions = "[3.0.0.RELEASE,)"
+    extraDependency "javax.servlet:javax.servlet.api:3.0.0"
+  }
+}
 
 apply from: "${rootDir}/gradle/java.gradle"
 
diff --git a/dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
index 2ba50b9b9d..987b304797 100644
--- a/dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring-web/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java
@@ -1,7 +1,6 @@
 package datadog.trace.instrumentation.springweb;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClassWithField;
 import static io.opentracing.log.Fields.ERROR_OBJECT;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -46,12 +45,6 @@ public final class HandlerAdapterInstrumentation extends Instrumenter.Default {
         .and(safeHasSuperType(named("org.springframework.web.servlet.HandlerAdapter")));
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClassWithField(
-        "org.springframework.web.servlet.HandlerMapping", "BEST_MATCHING_PATTERN_ATTRIBUTE");
-  }
-
   @Override
   public Map<ElementMatcher, String> transformers() {
     return Collections.<ElementMatcher, String>singletonMap(