diff --git a/error-prone-contrib/pom.xml b/error-prone-contrib/pom.xml
index 93c0c7a8d8..7c12e0c3e9 100644
--- a/error-prone-contrib/pom.xml
+++ b/error-prone-contrib/pom.xml
@@ -248,17 +248,6 @@
                         </compilerArgs>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <configuration>
-                        <ignoredUnusedDeclaredDependencies>
-                            <!-- XXX: Figure out why the plugin thinks this
-                            dependency is unused. -->
-                            <ignoredUnusedDeclaredDependency>${project.groupId}:refaster-support</ignoredUnusedDeclaredDependency>
-                        </ignoredUnusedDeclaredDependencies>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/pom.xml b/pom.xml
index 7d7e6f9e5f..34c7df3e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1033,18 +1033,7 @@
                             </requireMavenVersion>
                             <requireNoRepositories />
                             <requirePluginVersions />
-                            <requireUpperBoundDeps>
-                                <excludes>
-                                    <!-- XXX:
-                                    `com.google.errorprone:error_prone_test_helpers`
-                                    pulls in a more recent version of Truth
-                                    than
-                                    `com.google.testing.compile:compile-testing`,
-                                    but the latter is incompatible with said
-                                    never version. -->
-                                    <exclude>com.google.truth:truth</exclude>
-                                </excludes>
-                            </requireUpperBoundDeps>
+                            <requireUpperBoundDeps />
                         </rules>
                     </configuration>
                     <dependencies>
@@ -1738,11 +1727,8 @@
                                     -XepOpt:NullAway:CheckOptionalEmptiness=true
                                     -XepOpt:Nullness:Conservative=false
                                     -XepOpt:StatementSwitchToExpressionSwitch:EnableAssignmentSwitchConversion=true
+                                    -XepOpt:StatementSwitchToExpressionSwitch:EnableDirectConversion=true
                                     -XepOpt:StatementSwitchToExpressionSwitch:EnableReturnSwitchConversion=true
-                                    <!-- XXX: Enable once this check respects
-                                    the compilation source version. See
-                                    https://github.com/google/error-prone/pull/3646.
-                                    -XepOpt:StatementSwitchToExpressionSwitch:EnableDirectConversion=true -->
                                     <!-- Append additional custom arguments. -->
                                     ${error-prone.patch-args}
                                     ${error-prone.self-check-args}