Index: src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
===================================================================
--- src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java  (revision 1035105)
+++ src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java  (working copy)
@@ -34,6 +34,7 @@
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.spans.FieldMaskingSpanQuery;
 import org.apache.lucene.search.spans.SpanFirstQuery;
+import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
 import org.apache.lucene.search.spans.SpanNearQuery;
 import org.apache.lucene.search.spans.SpanNotQuery;
 import org.apache.lucene.search.spans.SpanOrQuery;
@@ -142,16 +143,9 @@
         extract(iterator.next(), terms);
       }
     } else if (query instanceof MultiTermQuery && expandMultiTermQuery) {
-      MultiTermQuery mtq = ((MultiTermQuery)query);
-      if(mtq.getRewriteMethod() != MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE) {
-        mtq = (MultiTermQuery) mtq.clone();
-        mtq.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
-        query = mtq;
-      }
-      if (mtq.getField() != null) {
-        IndexReader ir = getReaderForField(mtq.getField());
-        extract(query.rewrite(ir), terms);
-      }
+      MultiTermQuery mtq = ((MultiTermQuery)query.clone());
+      SpanMultiTermQueryWrapper<MultiTermQuery> wrapper = new SpanMultiTermQueryWrapper<MultiTermQuery>(mtq);
+      extractWeightedSpanTerms(terms, wrapper);
     } else if (query instanceof MultiPhraseQuery) {
       final MultiPhraseQuery mpq = (MultiPhraseQuery) query;
       final List<Term[]> termArrays = mpq.getTermArrays();