diff --git a/gradle/error-prone.gradle b/gradle/error-prone.gradle
index 8b73fdbe4e..9f9b0e0914 100644
--- a/gradle/error-prone.gradle
+++ b/gradle/error-prone.gradle
@@ -4,6 +4,8 @@ apply plugin: 'net.ltgt.errorprone'
 
 dependencies {
 	errorprone('com.google.errorprone:error_prone_core:2.42.0')
+//	bug https://github.com/google/error-prone/issues/5293
+//	errorprone('com.google.errorprone:error_prone_core:2.43.0')
 	errorprone('tech.picnic.error-prone-support:error-prone-contrib:0.25.0')
 }
 
@@ -31,6 +33,7 @@ tasks.withType(JavaCompile).configureEach {
 				)
 		error(
 				'AmbiguousJsonCreator',
+				'UnnecessarilyFullyQualified',
 				'AssertJNullnessAssertion',
 				'AutowiredConstructor',
 				'CanonicalAnnotationSyntax',
@@ -61,32 +64,33 @@ tasks.withType(JavaCompile).configureEach {
 			errorproneArgs.addAll(
 					'-XepPatchLocation:IN_PLACE',
 					'-XepPatchChecks:' +
-					'AmbiguousJsonCreator,' +
-					'ArrayEquals,' +
-					'AssertJNullnessAssertion,' +
-					'AutowiredConstructor,' +
-					'CanonicalAnnotationSyntax,' +
-					'CollectorMutability,' +
-					'ConstantNaming,' +
-					'DirectReturn,' +
-					'EmptyMethod,' +
-					'ExplicitArgumentEnumeration,' +
-					'ExplicitEnumOrdering,' +
-					'FormatStringConcatenation,' +
-					'IdentityConversion,' +
-					'ImmutablesSortedSetComparator,' +
-					'IsInstanceLambdaUsage,' +
-					'MockitoMockClassReference,' +
-					'MockitoStubbing,' +
-					'NestedOptionals,' +
-					'PrimitiveComparison,' +
-					'RedundantStringConversion,' +
-					'RedundantStringEscape,' +
-					'SelfAssignment,' +
-					'Slf4jLogStatement,' +
-					'StringJoin,' +
-					'StringJoining,' +
-					'TimeZoneUsage,'
+					'UnnecessarilyFullyQualified,'
+//					'AmbiguousJsonCreator,' +
+//					'ArrayEquals,' +
+//					'AssertJNullnessAssertion,' +
+//					'AutowiredConstructor,' +
+//					'CanonicalAnnotationSyntax,' +
+//					'CollectorMutability,' +
+//					'ConstantNaming,' +
+//					'DirectReturn,' +
+//					'EmptyMethod,' +
+//					'ExplicitArgumentEnumeration,' +
+//					'ExplicitEnumOrdering,' +
+//					'FormatStringConcatenation,' +
+//					'IdentityConversion,' +
+//					'ImmutablesSortedSetComparator,' +
+//					'IsInstanceLambdaUsage,' +
+//					'MockitoMockClassReference,' +
+//					'MockitoStubbing,' +
+//					'NestedOptionals,' +
+//					'PrimitiveComparison,' +
+//					'RedundantStringConversion,' +
+//					'RedundantStringEscape,' +
+//					'SelfAssignment,' +
+//					'Slf4jLogStatement,' +
+//					'StringJoin,' +
+//					'StringJoining,' +
+//					'TimeZoneUsage,'
 					)
 		}
 	}
diff --git a/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java b/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java
index 045860f535..5d4c3db401 100644
--- a/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java
+++ b/lib-extra/src/cdt/java/com/diffplug/spotless/extra/glue/cdt/EclipseCdtFormatterStepImpl.java
@@ -20,7 +20,7 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
+import org.eclipse.cdt.core.ToolFactory;
 import org.eclipse.cdt.core.formatter.CodeFormatter;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -35,7 +35,7 @@ public EclipseCdtFormatterStepImpl(Properties settings) throws Exception {
 		Map<String, String> settingsMap = stream.collect(Collectors.toMap(
 				e -> String.valueOf(e.getKey()),
 				e -> String.valueOf(e.getValue())));
-		codeFormatter = org.eclipse.cdt.core.ToolFactory.createDefaultCodeFormatter(settingsMap);
+		codeFormatter = ToolFactory.createDefaultCodeFormatter(settingsMap);
 	}
 
 	/** Formatting C/C++ string */