diff --git a/csharp/ProtocolBuffers/TextFormat.cs b/csharp/ProtocolBuffers/TextFormat.cs
index 14f1ec73f0..48b2d8af26 100644
--- a/csharp/ProtocolBuffers/TextFormat.cs
+++ b/csharp/ProtocolBuffers/TextFormat.cs
@@ -58,8 +58,6 @@ namespace Google.ProtocolBuffers {
     }
 
     private static void Print(IMessage message, TextGenerator generator) {
-      // TODO(jonskeet): Check why descriptor is never used.
-      MessageDescriptor descriptor = message.DescriptorForType;
       foreach (KeyValuePair<FieldDescriptor, object> entry in message.AllFields) {
         PrintField(entry.Key, entry.Value, generator);
       }
diff --git a/java/src/main/java/com/google/protobuf/TextFormat.java b/java/src/main/java/com/google/protobuf/TextFormat.java
index 2d949b658c..8bb7e1ed18 100644
--- a/java/src/main/java/com/google/protobuf/TextFormat.java
+++ b/java/src/main/java/com/google/protobuf/TextFormat.java
@@ -91,7 +91,6 @@ public final class TextFormat {
 
   private static void print(Message message, TextGenerator generator)
       throws IOException {
-    Descriptor descriptor = message.getDescriptorForType();
     for (Map.Entry<FieldDescriptor, Object> field :
          message.getAllFields().entrySet()) {
       printField(field.getKey(), field.getValue(), generator);