sdether
diff --git a/‎MongoDB.Net-Tests/Bson/TestRoundTrips.cs
Copy file name to clipboardExpand all lines: MongoDB.Net-Tests/Bson/TestRoundTrips.cs
+1-27 b/‎MongoDB.Net-Tests/Bson/TestRoundTrips.cs
Copy file name to clipboardExpand all lines: MongoDB.Net-Tests/Bson/TestRoundTrips.cs
+1-27
diff --git a/‎MongoDBDriver/Bson/BsonReader.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Bson/BsonReader.cs
-7 b/‎MongoDBDriver/Bson/BsonReader.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Bson/BsonReader.cs
-7
diff --git a/‎MongoDBDriver/Bson/BsonWriter.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Bson/BsonWriter.cs
+16-28 b/‎MongoDBDriver/Bson/BsonWriter.cs
Copy file name to clipboardExpand all lines: MongoDBDriver/Bson/BsonWriter.cs
+16-28
@@ -79,32 +79,6 @@ public void TestDateUTC(){
 
             Assert.AreEqual(now.Hour,then.Hour, "Date did not round trip right.");
 
-        }
-
-        [Test]
-        public void TestGUID() {
-            MemoryStream ms = new MemoryStream();
-            BsonWriter writer = new BsonWriter(ms);
-
-            Guid guid = Guid.NewGuid();
-
-            Document source = new Document();
-            source.Append("uuid", guid);
-
-            /*Binary b = new Binary(guid.ToByteArray());
-            b.Subtype = Binary.TypeCode.Uuid;
-            source.Append("uuid", b);*/
-
-            writer.Write(source);
-            writer.Flush();
-            ms.Seek(0, SeekOrigin.Begin);
-
-            BsonReader reader = new BsonReader(ms);
-            Document copy = reader.Read();
-
-            Guid read = (Guid)copy["uuid"];
-
-            Assert.AreEqual(guid, read, "UUID did not round trip right.");
-        }
+        }        
     }
 }
@@ -148,13 +148,6 @@ public Object ReadElementType (sbyte typeNum){
                 }
                 byte[] bytes = reader.ReadBytes (size);
                 position += size;
-
-                // From http://en.wikipedia.org/wiki/Universally_Unique_Identifier
-                // The most widespread use of this standard is in Microsoft's Globally Unique Identifiers (GUIDs).
-                if (subtype == 3 && 16 == size) {
-                    return new Guid(bytes);
-                }
-
                 Binary b = new Binary ();
                 b.Bytes = bytes;
                 b.Subtype = (Binary.TypeCode)subtype;
 
@@ -117,22 +117,16 @@ public void WriteValue(BsonDataType dt, Object obj){
                     return;
                 }
                 case BsonDataType.Binary:{
-                    if (obj is Guid) {
-                        writer.Write((int)16);
-                        writer.Write((byte)3);
-                        writer.Write(((Guid)obj).ToByteArray());
-                    } else {
-                        Binary b = (Binary)obj;
-                        if(b.Subtype == Binary.TypeCode.General){
-                            writer.Write(b.Bytes.Length + 4);
-                            writer.Write((byte)b.Subtype);
-                            writer.Write(b.Bytes.Length);
-                        }else{
-                            writer.Write(b.Bytes.Length);
-                            writer.Write((byte)b.Subtype);
-                        }
-                        writer.Write(b.Bytes);
+                    Binary b = (Binary)obj;
+                    if(b.Subtype == Binary.TypeCode.General){
+                        writer.Write(b.Bytes.Length + 4);
+                        writer.Write((byte)b.Subtype);
+                        writer.Write(b.Bytes.Length);
+                    }else{
+                        writer.Write(b.Bytes.Length);
+                        writer.Write((byte)b.Subtype);
                     }
+                    writer.Write(b.Bytes);                    
                     return;
                 }
                 default:
@@ -208,18 +202,14 @@ public int CalculateSize(Object val){
                     return size;
                     }
                 case BsonDataType.Binary:{
-                    if (val is Guid)
-                        return 21;
-                    else {
-                        Binary b = (Binary)val;
-                        int size = 4; //size int
-                        size += 1; //subtype
-                        if(b.Subtype == Binary.TypeCode.General){
-                            size += 4; //embedded size int
-                        }
-                        size += b.Bytes.Length;
-                        return size;
+                    Binary b = (Binary)val;
+                    int size = 4; //size int
+                    size += 1; //subtype
+                    if(b.Subtype == Binary.TypeCode.General){
+                        size += 4; //embedded size int
                     }
+                    size += b.Bytes.Length;
+                    return size;
                 }
                 default:
                     throw new NotImplementedException(String.Format("Calculating size of {0} is not implemented.",val.GetType().Name));
@@ -305,8 +295,6 @@ protected BsonDataType TranslateToBsonType(Object val){
                 ret = BsonDataType.Null;
             }else if(t == typeof(Binary)){
                 ret = BsonDataType.Binary;
-            }else if(t == typeof(Guid)){
-                ret = BsonDataType.Binary;
             }else if(t == typeof(MongoMinKey)){
                 ret = BsonDataType.MinKey;
             }else if(t == typeof(MongoMaxKey)){