Revert "Extract common logic" (facebook#13547)

* Revert "Fix test"

This reverts commit 17a57ad.

* Revert "Extract common logic (facebook#13535)"

This reverts commit 605da8b.

Author: gaearon

packages/react-reconciler/src/ReactFiberScheduler.js

@@ -1601,13 +1601,14 @@ function retrySuspendedRoot(
     if (isPriorityLevelSuspended(root, suspendedTime)) {
       // Ping at the original level
       retryTime = suspendedTime;
+      markPingedPriorityLevel(root, retryTime);
     } else {
       // Placeholder already timed out. Compute a new expiration time
       const currentTime = requestCurrentTime();
       retryTime = computeExpirationForFiber(currentTime, fiber);
+      markPendingPriorityLevel(root, retryTime);
     }
 
-    markPingedPriorityLevel(root, retryTime);
     scheduleWorkToRoot(fiber, retryTime);
     const rootExpirationTime = root.expirationTime;
     if (rootExpirationTime !== NoWork) {