diff --git a/pom.xml b/pom.xml
index ec0d1c38..629c7c86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
         <!-- Dependency and plugin versions that are referenced in more than
         one place. We use these to keep dependencies in sync. Version numbers
         that need to be referenced only once should *not* be listed here. -->
-        <version.auto-service>1.0.1</version.auto-service>
+        <version.auto-service>1.0</version.auto-service>
         <version.auto-value>1.9</version.auto-value>
         <version.error-prone>${version.error-prone-orig}</version.error-prone>
         <version.error-prone-fork>v${version.error-prone-orig}-picnic-3</version.error-prone-fork>
diff --git a/weird-classpath-issue/pom.xml b/weird-classpath-issue/pom.xml
index 8906be73..2db14c36 100644
--- a/weird-classpath-issue/pom.xml
+++ b/weird-classpath-issue/pom.xml
@@ -17,23 +17,8 @@
         <dependency>
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
-            <version>1.0.1</version>
+            <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.PicnicSupermarket.error-prone</groupId>
-            <artifactId>error_prone_annotation</artifactId>
-            <version>v2.10.0-picnic-3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.PicnicSupermarket.error-prone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <version>v2.10.0-picnic-3</version>
-        </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>com.google.auto.service</groupId>-->
-        <!--            <artifactId>auto-service-annotations</artifactId>-->
-        <!--            <version>1.0.1</version>-->
-        <!--        </dependency>-->
     </dependencies>
 
     <build>
@@ -49,7 +34,7 @@
                             <path>
                                 <groupId>com.google.auto.service</groupId>
                                 <artifactId>auto-service</artifactId>
-                                <version>1.0.1</version>
+                                <version>1.0</version>
                             </path>
                         </annotationProcessorPaths>
                         <parameters>true</parameters>
@@ -71,7 +56,7 @@
 
     <profiles>
         <profile>
-            <id>error-prone</id>
+            <id>guava</id>
             <build>
                 <plugins>
                     <plugin>
@@ -80,15 +65,20 @@
                         <configuration>
                             <annotationProcessorPaths combine.children="append">
                                 <path>
-                                    <groupId>com.github.PicnicSupermarket.error-prone</groupId>
-                                    <artifactId>error_prone_annotations</artifactId>
-                                    <version>v2.10.0-picnic-3</version>
+                                    <groupId>com.google.guava</groupId>
+                                    <artifactId>guava</artifactId>
+                                    <version>31.0.1-jre</version>
                                 </path>
-                                <!--                                <path>-->
-                                <!--                                    <groupId>com.github.PicnicSupermarket.error-prone</groupId>-->
-                                <!--                                    <artifactId>error_prone_core</artifactId>-->
-                                <!--                                    <version>v2.10.0-picnic-1</version>-->
-                                <!--                                </path>-->
+                                <!-- <path>-->
+                                <!--     <groupId>com.github.PicnicSupermarket.error-prone</groupId>-->
+                                <!--     <artifactId>error_prone_annotations</artifactId>-->
+                                <!--     <version>v2.10.0-picnic-3</version>-->
+                                <!-- </path>-->
+                                <!-- <path>-->
+                                <!--     <groupId>com.github.PicnicSupermarket.error-prone</groupId>-->
+                                <!--     <artifactId>error_prone_core</artifactId>-->
+                                <!--     <version>v2.10.0-picnic-1</version>-->
+                                <!-- </path>-->
                             </annotationProcessorPaths>
                         </configuration>
                     </plugin>