diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/PDOMTypeReference.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/PDOMTypeReference.java
index 398aac9d493..292728fda4f 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/PDOMTypeReference.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/PDOMTypeReference.java
@@ -76,7 +76,11 @@ public class PDOMTypeReference implements ITypeReference {
 	}
 
 	public ITranslationUnit getTranslationUnit() {
-		return CoreModel.getDefault().createTranslationUnitFrom(project, path);
+		ICElement element = CoreModel.getDefault().create(path);
+		if (element != null && element instanceof ITranslationUnit)
+			return (ITranslationUnit)element;
+		else
+			return CoreModel.getDefault().createTranslationUnitFrom(project, path);
 	}
 
 	public IWorkingCopy getWorkingCopy() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java
index 2afc3369a20..840af2351a9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java
@@ -96,11 +96,6 @@ public class CSourceViewer extends ProjectionViewer implements ITextViewerExtens
 			IFile file = ResourceUtil.getFile(input);
 			if (file != null) {
 				contentType = CCorePlugin.getContentType(file.getProject(), file.getName());
-				try {
-					return LanguageManager.getInstance().getLanguage(contentType);
-				} catch (CoreException exc) {
-					CUIPlugin.getDefault().log(exc.getStatus());
-				}
 			} else if (input instanceof IPathEditorInput) {
 				IPath path = ((IPathEditorInput)input).getPath();
 				contentType = CCorePlugin.getContentType(path.lastSegment());