diff --git a/org.eventb.texteditor.feature/feature.xml b/org.eventb.texteditor.feature/feature.xml
index c9827f88c9253155a26dc663963f5b661786a977..139b150d62758a2ff32f90ad4e0b75d9517905e2 100644
--- a/org.eventb.texteditor.feature/feature.xml
+++ b/org.eventb.texteditor.feature/feature.xml
@@ -9,7 +9,7 @@
    <description>
       A text editor for the Rodin platform to edit Event-B models
 --- Release History ---
-3.6.0 - Improved performance when saving larger files.
+3.6.0 - Improved performance when saving larger files. Disallowed compatibility with Event-B EMF 7.0.0 again, because of a bug that breaks ordering of elements in a context/machine.
 3.5.1 - Fix "Empty label" error when adding a variant to a machine
 3.5.0 - Compatibility with EventB-EMF 7.0.0 - fixes CamilleX dependency conflict. Fixed OOM error when top-level end keyword is missing.
 3.4.1 - Internal updates to the build process - no visible changes.
diff --git a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
index d52d036bd0720bcb7fad0e2e1824d99a03507f03..e9f8081be9fbb3b88c176815db4e24b128705838 100644
--- a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
+++ b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
@@ -16,9 +16,9 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
  org.eclipse.ui.workbench.texteditor,
  org.eventb.core;bundle-version="[3.1.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.1.0,4.0.0)",
- org.eventb.emf.core;bundle-version="[5.0.0,7.0.0)",
- org.eventb.emf.formulas;bundle-version="[1.5.0,3.0.0)",
- org.eventb.emf.persistence;bundle-version="[3.6.0,5.0.0)";visibility:=reexport,
+ org.eventb.emf.core;bundle-version="[5.0.0,6.0.0)",
+ org.eventb.emf.formulas;bundle-version="[1.5.0,2.0.0)",
+ org.eventb.emf.persistence;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eventb.texteditor.parsers;bundle-version="[3.5.2,3.6.0)",
  org.eventb.texttools;bundle-version="[3.5.2,3.6.0)";visibility:=reexport,
  org.eventb.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
diff --git a/org.eventb.texttools/META-INF/MANIFEST.MF b/org.eventb.texttools/META-INF/MANIFEST.MF
index a8a3e801c7665a26c885903ac6ae3e37e56c6482..ab059e41c3a906cc67641548743953a0d774416e 100644
--- a/org.eventb.texttools/META-INF/MANIFEST.MF
+++ b/org.eventb.texttools/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
  org.eventb.core;bundle-version="[3.1.0,4.0.0)",
  org.eventb.core.ast;bundle-version="[3.1.0,4.0.0)",
- org.eventb.emf.core;bundle-version="[5.0.0,7.0.0)",
- org.eventb.emf.formulas;bundle-version="[1.5.0,3.0.0)",
- org.eventb.emf.persistence;bundle-version="[3.6.0,5.0.0)",
+ org.eventb.emf.core;bundle-version="[5.0.0,6.0.0)",
+ org.eventb.emf.formulas;bundle-version="[1.5.0,2.0.0)",
+ org.eventb.emf.persistence;bundle-version="[3.6.0,4.0.0)",
  org.eventb.texteditor.parsers;bundle-version="[3.5.2,3.6.0)",
  org.rodinp.core;bundle-version="[1.7.0,2.0.0)"
 Bundle-Vendor: Heinrich-Heine University Dusseldorf