diff --git a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
index 646b74f..d7675b3 100644
--- a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@
  org.antlr.runtime,
  org.eclipse.core.runtime,
  com.ibm.icu,
- org.eclipse.emf.databinding,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem;bundle-version="1.3.100",
  org.eclipse.compare.core;bundle-version="3.5.200",
diff --git a/com.google.eclipse.protobuf.ui/plugin.xml b/com.google.eclipse.protobuf.ui/plugin.xml
index 8edb1b1..9501cdf 100644
--- a/com.google.eclipse.protobuf.ui/plugin.xml
+++ b/com.google.eclipse.protobuf.ui/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
   <extension point="org.eclipse.ui.editors">
-    <editor class="com.google.eclipse.protobuf.ui.ProtobufExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+    <editor class="com.google.eclipse.protobuf.ui.ProtobufExecutableExtensionFactory:com.google.eclipse.protobuf.ui.editor.ProtobufEditor"
       contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor" default="true" icon="icons/pb.gif"
       id="com.google.eclipse.protobuf.Protobuf" name="%editor.name">
       <contentTypeBinding contentTypeId="com.google.eclipse.protobuf.Protobuf">
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/ProtobufEditor.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/ProtobufEditor.java
new file mode 100644
index 0000000..241f6f2
--- /dev/null
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/editor/ProtobufEditor.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2012 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.ui.editor;
+
+import org.eclipse.xtext.ui.editor.XtextEditor;
+
+/**
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+public class ProtobufEditor extends XtextEditor {
+}
\ No newline at end of file