diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index 279211d4080..014341b867d 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -1754,6 +1754,9 @@ bool GVN::runOnFunction(Function& F) {
 
   unsigned Iteration = 0;
 
+  // FIXME: Remove this when PR8954 is fixed.
+  DT->DT->recalculate(F);
+
   while (ShouldContinue) {
     DEBUG(dbgs() << "GVN iteration: " << Iteration << "\n");
     ShouldContinue = iterateOnFunction(F);
@@ -2011,7 +2014,6 @@ bool GVN::iterateOnFunction(Function &F) {
        RE = RPOT.end(); RI != RE; ++RI)
     Changed |= processBlock(*RI);
 #else
-  DT->DT->recalculate(F);
   for (df_iterator<DomTreeNode*> DI = df_begin(DT->getRootNode()),
        DE = df_end(DT->getRootNode()); DI != DE; ++DI)
     Changed |= processBlock(DI->getBlock());