Revert of [heap] Always use the passed-in collector in CollectGarbage.

src/heap/heap.cc

Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 23bdb3c7122d167473d3120834d319fbea5ea2a4..37848c25942f4ecd822b517cd3deed066f18d27e 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -982,6 +982,22 @@
     }
   }
 
+  if (collector == MARK_COMPACTOR && !ShouldFinalizeIncrementalMarking() &&
+      !ShouldAbortIncrementalMarking() && !incremental_marking()->IsStopped() &&
+      !incremental_marking()->should_hurry() && FLAG_incremental_marking &&
+      OldGenerationAllocationLimitReached()) {
+    if (!incremental_marking()->IsComplete() &&
+        !mark_compact_collector()->marking_deque_.IsEmpty() &&
+        !FLAG_gc_global) {
+      if (FLAG_trace_incremental_marking) {
+        isolate()->PrintWithTimestamp(
+            "[IncrementalMarking] Delaying MarkSweep.\n");
+      }
+      collector = SCAVENGER;
+      collector_reason = "incremental marking delaying mark-sweep";
+    }
+  }
+
   bool next_gc_likely_to_collect_more = false;
   intptr_t committed_memory_before = 0;