Index: src/java/org/apache/lucene/document/AbstractField.java
===================================================================
--- src/java/org/apache/lucene/document/AbstractField.java	(revision 962932)
+++ src/java/org/apache/lucene/document/AbstractField.java	(working copy)
@@ -17,7 +17,6 @@
 
 import org.apache.lucene.search.PhraseQuery; // for javadocs
 import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.util.StringHelper; // for javadocs
 
 
@@ -41,8 +40,6 @@
   protected float boost = 1.0f;
   // the data object for all different kind of field values
   protected Object fieldsData = null;
-  // pre-analyzed tokenStream for indexed fields
-  protected TokenStream tokenStream;
   // length/offset for all primitive types
   protected int binaryLength;
   protected int binaryOffset;
Index: src/java/org/apache/lucene/document/Field.java
===================================================================
--- src/java/org/apache/lucene/document/Field.java	(revision 962932)
+++ src/java/org/apache/lucene/document/Field.java	(working copy)
@@ -563,4 +563,7 @@
     
     setStoreTermVector(TermVector.NO);
   }
+
+  // pre-analyzed tokenStream for indexed fields
+  protected TokenStream tokenStream;
 }