diff --git a/plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/builder/BuilderIntegrationFragment.java b/plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/builder/BuilderIntegrationFragment.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/builder/BuilderIntegrationFragment.java
+++ b/plugins/org.eclipse.xtext.generator/src/org/eclipse/xtext/generator/builder/BuilderIntegrationFragment.java
@@ -53,7 +53,7 @@ public class BuilderIntegrationFragment extends DefaultGeneratorFragment {
 					"binder.bind(" + IResourceDescriptions.class.getName() + ".class"
 							+ ").annotatedWith(com.google.inject.name.Names.named("
 							+ AbstractGlobalScopeProvider.class.getName() + ".NAMED_BUILDER_SCOPE)).to("
-							+ "org.eclipse.xtext.builder.builderState.ShadowingResourceDescriptions.class)")
+							+ "org.eclipse.xtext.builder.clustering.CurrentDescriptions.ResourceSetAware.class)")
 			.addTypeToType("org.eclipse.xtext.ui.editor.IXtextEditorCallback", "org.eclipse.xtext.builder.nature.NatureAddingEditorCallback")
 			.addConfiguredBinding(
 					IResourceDescriptions.class.getName() + "Persisted",
ClusteredBuilder should be enabled by default (and the only implementation that we ship)