diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java
index 37d9e6dc3..633df0e3e 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/IndentationAwareUiTestLanguageInjectorProvider.java
@@ -67,8 +67,7 @@ public class IndentationAwareUiTestLanguageInjectorProvider implements IInjector
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java
index d03bc2fe5..d31ee2148 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialContentAssistTestLanguageInjectorProvider.java
@@ -67,8 +67,7 @@ public class PartialContentAssistTestLanguageInjectorProvider implements IInject
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java
index 4602fc8da..edfef671c 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/PartialSerializationTestLanguageInjectorProvider.java
@@ -67,8 +67,7 @@ public class PartialSerializationTestLanguageInjectorProvider implements IInject
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java
index 38e9c2c84..0a0001997 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/RenameTestLanguageInjectorProvider.java
@@ -67,8 +67,7 @@ public class RenameTestLanguageInjectorProvider implements IInjectorProvider, IR
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java
index b694856be..fad9afff7 100644
--- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/tests/TestLanguageInjectorProvider.java
@@ -67,8 +67,7 @@ public class TestLanguageInjectorProvider implements IInjectorProvider, IRegistr
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java
index a9bb909cf..944efd578 100644
--- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/tests/FileAwareTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class FileAwareTestLanguageInjectorProvider implements IInjectorProvider,
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java
index 23ba54152..44fc80fd7 100644
--- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/tests/XtextGrammarTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class XtextGrammarTestLanguageInjectorProvider implements IInjectorProvid
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java
index 9a364a46d..d978bc16b 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/tests/FormatterTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class FormatterTestLanguageInjectorProvider implements IInjectorProvider,
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java
index 39b5fe0d7..e77bc933e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/tests/RegionAccessTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class RegionAccessTestLanguageInjectorProvider implements IInjectorProvid
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java
index b0d34d3ac..6929a08e7 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/tests/LazyLinkingTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class LazyLinkingTestLanguageInjectorProvider implements IInjectorProvide
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java
index e1be08f24..469670062 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageExInjectorProvider.java
@@ -63,8 +63,7 @@ public class FragmentTestLanguageExInjectorProvider implements IInjectorProvider
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java
index a79916abc..23fd2d06f 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/tests/FragmentTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class FragmentTestLanguageInjectorProvider implements IInjectorProvider,
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java
index 16791d80c..e5bdc657e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/tests/IndentationAwareTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class IndentationAwareTestLanguageInjectorProvider implements IInjectorPr
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java
index d535a2a29..d0d7975c8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/NoParametersTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class NoParametersTestLanguageInjectorProvider implements IInjectorProvid
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java
index ba384f603..18b62b27c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageExInjectorProvider.java
@@ -63,8 +63,7 @@ public class ParametersTestLanguageExInjectorProvider implements IInjectorProvid
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java
index 4116d0cd2..ffd1250b0 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/ParametersTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class ParametersTestLanguageInjectorProvider implements IInjectorProvider
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java
index b9e35d9d9..73fe2a300 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/tests/TwoParametersTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class TwoParametersTestLanguageInjectorProvider implements IInjectorProvi
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java
index c412dca25..c27c1df9c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/tests/SequencerTestLanguageInjectorProvider.java
@@ -63,8 +63,7 @@ public class SequencerTestLanguageInjectorProvider implements IInjectorProvider,
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/XtextInjectorProvider.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/XtextInjectorProvider.java
index da99fafe3..fcb350d4e 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/XtextInjectorProvider.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/tests/XtextInjectorProvider.java
@@ -41,8 +41,7 @@ public class XtextInjectorProvider implements IInjectorProvider, IRegistryConfig
 		stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		if (injector == null) {
 			getInjector();
-		} else {
-			stateAfterInjectorCreation.restoreGlobalState();
 		}
+		stateAfterInjectorCreation.restoreGlobalState();
 	}
 }
\ No newline at end of file
diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
index d169b3ad8..fb4ecb029 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.xtend
@@ -210,9 +210,8 @@ class JUnitFragment extends AbstractStubGeneratingFragment {
 					stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 					if (injector == null) {
 						getInjector();
-					} else {
-						stateAfterInjectorCreation.restoreGlobalState();
 					}
+					stateAfterInjectorCreation.restoreGlobalState();
 				}
 			}
 		'''
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
index 57db72c4f..0f9bccb30 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/junit/JUnitFragment.java
@@ -513,13 +513,10 @@ public class JUnitFragment extends AbstractStubGeneratingFragment {
           _builder.append("getInjector();");
           _builder.newLine();
           _builder.append("\t\t");
-          _builder.append("} else {");
-          _builder.newLine();
-          _builder.append("\t\t\t");
-          _builder.append("stateAfterInjectorCreation.restoreGlobalState();");
+          _builder.append("}");
           _builder.newLine();
           _builder.append("\t\t");
-          _builder.append("}");
+          _builder.append("stateAfterInjectorCreation.restoreGlobalState();");
           _builder.newLine();
           _builder.append("\t");
           _builder.append("}");