Revert previous workarounds
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
index f7eb149..f5b8a28 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@
org.eclipse.objectteams.otdt.ui.help
Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.ui.intro;bundle-version="[3.4.100,4.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.4.100,4.0.0)",
org.eclipse.help;bundle-version="[3.5.100,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index cc77362..4f54ae6 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -36,15 +36,13 @@
plugin@org.eclipse.objectteams.otequinox.branding=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=builds/201706061121
plugin@org.eclipse.objectteams.otequinox.branding.otre=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding.otre,tag=builds/201706061122
plugin@org.eclipse.objectteams.otdt.jdt.ui=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui
-!plugin@org.eclipse.objectteams.otdt.ui.help=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help
-plugin@org.eclipse.objectteams.otdt.ui.help,2.5.0=p2IU,id=org.eclipse.objectteams.otdt.ui.help,version=2.5.0.201606070956,repository=https://download.eclipse.org/objectteams/updates/ot2.8/202006091155
+plugin@org.eclipse.objectteams.otdt.ui.help=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=builds/201606070956
plugin@org.eclipse.objectteams.otdt.apt=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.apt,tag=builds/202003100937
plugin@org.eclipse.objectteams.otdt.compiler.adaptor=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.compiler.adaptor
plugin@org.eclipse.objectteams.otdt.debug.adaptor=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.debug.adaptor
plugin@org.eclipse.objectteams.otdt.refactoring=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.refactoring
plugin@org.eclipse.objectteams.otdt.pde.ui=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.pde.ui
-!plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples
-plugin@org.eclipse.objectteams.otdt.samples,2.8.2=p2IU,id=org.eclipse.objectteams.otdt.samples,version=2.8.2.202209081217,repository=https://download.eclipse.org/objectteams/updates/ot2.8/202209081217
+plugin@org.eclipse.objectteams.otdt.samples=GIT,repo=https://git.eclipse.org/r/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.samples
!** Consume BCEL from Orbit: **!
plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository