diff --git a/jdt-patch/e42/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/jdt-patch/e42/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
index 513e694892..f74296e6ad 100644
--- a/jdt-patch/e42/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
+++ b/jdt-patch/e42/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -295,7 +295,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}
diff --git a/jdt-patch/e43/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/jdt-patch/e43/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
index 1723c180b2..83c6c484a3 100644
--- a/jdt-patch/e43/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
+++ b/jdt-patch/e43/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -296,7 +296,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}
diff --git a/jdt-patch/e43j8/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/jdt-patch/e43j8/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
index 6becf25787..4433f2c1ec 100644
--- a/jdt-patch/e43j8/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
+++ b/jdt-patch/e43j8/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -725,7 +725,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}
diff --git a/jdt-patch/e44/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/jdt-patch/e44/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
index e85bbff88d..18a76cef8f 100644
--- a/jdt-patch/e44/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
+++ b/jdt-patch/e44/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -804,7 +804,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}
diff --git a/jdt-patch/e45/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/jdt-patch/e45/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
index 21789e8246..2945234d61 100644
--- a/jdt-patch/e45/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
+++ b/jdt-patch/e45/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -804,7 +804,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().notAnnotationType(typeBinding, this.type);
 			}
diff --git a/jdt-patch/e46/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/jdt-patch/e46/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
index 1c70dfcd1b..f23bfd4423 100644
--- a/jdt-patch/e46/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
+++ b/jdt-patch/e46/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -803,7 +803,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().notAnnotationType(typeBinding, this.type);
 			}