2 files changed, 0 insertions, 18 deletions
diff --git a/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs b/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs
index 92f5fd05..6a4b1430 100644
--- a/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs
+++ b/src/ProtocolBuffers/DescriptorProtos/PartialClasses.cs
@@ -35,20 +35,6 @@
 // IDescriptorProto
 namespace Google.ProtocolBuffers.DescriptorProtos {
 
-  // TODO(jonskeet): Find a better way of fixing this. It's needed in order to
-  // cope with unknown fields during initialization.
-  public partial class DescriptorProtoFile {
-    private static readonly bool initialized = false;
-
-    internal static bool Bootstrapping {
-      get { return !initialized; }
-    }
-
-    static DescriptorProtoFile() {
-      initialized = true;
-    }
-  }
-
   public partial class DescriptorProto : IDescriptorProto<MessageOptions> { }
   public partial class EnumDescriptorProto : IDescriptorProto<EnumOptions> { }
   public partial class EnumValueDescriptorProto : IDescriptorProto<EnumValueOptions> { }
diff --git a/src/ProtocolBuffers/UnknownFieldSet.cs b/src/ProtocolBuffers/UnknownFieldSet.cs
index a457fdf3..ecae53ce 100644
--- a/src/ProtocolBuffers/UnknownFieldSet.cs
+++ b/src/ProtocolBuffers/UnknownFieldSet.cs
@@ -472,10 +472,6 @@ namespace Google.ProtocolBuffers {
       internal bool MergeFieldFrom(CodedInputStream input, 
           ExtensionRegistry extensionRegistry, IBuilder builder, uint tag) {
 
-        if (DescriptorProtoFile.Bootstrapping) {
-          return MergeFieldFrom(tag, input);
-        }
-
         MessageDescriptor type = builder.DescriptorForType;
         if (type.Options.MessageSetWireFormat && tag == WireFormat.MessageSetTag.ItemStart) {
           MergeMessageSetExtensionFromCodedStream(input, extensionRegistry, builder);