diff --git a/org.eclipse.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.generator/META-INF/MANIFEST.MF
index eccdda60917..b01aa338071 100644
--- a/org.eclipse.xtext.generator/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.generator/META-INF/MANIFEST.MF
@@ -59,7 +59,6 @@ Require-Bundle: org.eclipse.xtext.xtext.generator;visibility:=reexport,
  org.eclipse.xtend.typesystem.emf;bundle-version="2.2.0";visibility:=reexport,
  org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
  org.eclipse.xtext;resolution:=optional;x-installation:=greedy,
- de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="2.26.0",
  org.eclipse.emf.common;bundle-version="2.24.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
@@ -72,5 +71,6 @@ Require-Bundle: org.eclipse.xtext.xtext.generator;visibility:=reexport,
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional;x-installation:=greedy,
  org.apache.log4j;version="1.2.24"
+DynamicImport-Package: de.itemis.xtext.antlr.toolrunner
 Automatic-Module-Name: org.eclipse.xtext.generator
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
index 9daf91ca88c..e53d049c442 100644
--- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.xtext;x-installation:=greedy,
  org.eclipse.emf.mwe2.lib;bundle-version="2.14.0";resolution:=optional,
  org.eclipse.equinox.common;bundle-version="3.16.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
  org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional
 Import-Package: org.apache.log4j;version="1.2.24"
 Export-Package: org.eclipse.xtext.xtext.generator,
@@ -62,5 +61,6 @@ Export-Package: org.eclipse.xtext.xtext.generator,
  org.eclipse.xtext.xtext.generator.validation,
  org.eclipse.xtext.xtext.generator.web,
  org.eclipse.xtext.xtext.generator.xbase
+DynamicImport-Package: de.itemis.xtext.antlr.toolrunner
 Automatic-Module-Name: org.eclipse.xtext.xtext.generator
 Eclipse-SourceReferences: eclipseSourceReferences
diff --git a/xtext-latest.target b/xtext-latest.target
index df2183403a6..fdf6fefb982 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -37,10 +37,6 @@
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.itemis.com/updates/releases/2.1.1"/>
-			<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
diff --git a/xtext-r202203.target b/xtext-r202203.target
index 08785885fd5..8209d04d271 100644
--- a/xtext-r202203.target
+++ b/xtext-r202203.target
@@ -42,10 +42,6 @@
 			<!-- required by mwe2.language (at least 2.29.0) -->
 			<unit id="org.eclipse.xtext" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.itemis.com/updates/releases/2.1.1"/>
-			<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
diff --git a/xtext-r202206.target b/xtext-r202206.target
index d91736a2b9b..ae37fc2c036 100644
--- a/xtext-r202206.target
+++ b/xtext-r202206.target
@@ -41,10 +41,6 @@
 			<!-- required by mwe2.language (at least 2.29.0) -->
 			<unit id="org.eclipse.xtext" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.itemis.com/updates/releases/2.1.1"/>
-			<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
diff --git a/xtext-r202209.target b/xtext-r202209.target
index d5766cb4312..07018e19025 100644
--- a/xtext-r202209.target
+++ b/xtext-r202209.target
@@ -39,10 +39,6 @@
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.itemis.com/updates/releases/2.1.1"/>
-			<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
diff --git a/xtext-r202212.target b/xtext-r202212.target
index 6cf35844864..cecfbd1ae0d 100644
--- a/xtext-r202212.target
+++ b/xtext-r202212.target
@@ -34,10 +34,6 @@
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.itemis.com/updates/releases/2.1.1"/>
-			<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
diff --git a/xtext-r202303.target b/xtext-r202303.target
index a528d57efcb..33ede7905ac 100644
--- a/xtext-r202303.target
+++ b/xtext-r202303.target
@@ -34,10 +34,6 @@
 			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.itemis.com/updates/releases/2.1.1"/>
-			<unit id="de.itemis.xtext.antlr.feature.feature.group" version="0.0.0"/>
-		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>