diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
index dfb6c9f8f99..02d416b986f 100644
--- a/gfx/thebes/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/gfxHarfBuzzShaper.cpp
@@ -1187,7 +1187,6 @@ gfxHarfBuzzShaper::SetGlyphsFromRun(gfxContext *aContext,
 
     while (glyphStart < PRInt32(numGlyphs)) {
 
-        bool inOrder = true;
         PRInt32 charEnd = ginfo[glyphStart].cluster;
         PRInt32 glyphEnd = glyphStart;
         PRInt32 charLimit = wordLength;
@@ -1232,9 +1231,6 @@ gfxHarfBuzzShaper::SetGlyphsFromRun(gfxContext *aContext,
                     allGlyphsAreWithinCluster = false;
                     break;
                 }
-                if (glyphCharIndex <= prevGlyphCharIndex) {
-                    inOrder = false;
-                }
                 prevGlyphCharIndex = glyphCharIndex;
             }
             if (allGlyphsAreWithinCluster) {
@@ -1369,8 +1365,7 @@ gfxHarfBuzzShaper::SetGlyphsFromRun(gfxContext *aContext,
         while (++baseCharIndex != endCharIndex &&
                baseCharIndex < PRInt32(wordLength)) {
             gfxTextRun::CompressedGlyph g;
-            g.SetComplex(inOrder &&
-                         aShapedWord->IsClusterStart(baseCharIndex),
+            g.SetComplex(aShapedWord->IsClusterStart(baseCharIndex),
                          false, 0);
             aShapedWord->SetGlyphs(baseCharIndex, g, nsnull);
         }