--- a/layout/printing/nsPrintJob.cpp
+++ b/layout/printing/nsPrintJob.cpp
@@ -717,27 +717,24 @@ nsPrintJob::DoCommonPrint(bool          
   bool remotePrintJobListening = false;
   if (!aIsPrintPreview) {
     rv = printData->mPrintSettings->GetPrintSession(
                                       getter_AddRefs(printSession));
     if (NS_FAILED(rv) || !printSession) {
       printSession = do_CreateInstance("@mozilla.org/gfx/printsession;1", &rv);
       NS_ENSURE_SUCCESS(rv, rv);
       printData->mPrintSettings->SetPrintSession(printSession);
-    } else {
-      RefPtr<mozilla::layout::RemotePrintJobChild> remotePrintJob;
-      printSession->GetRemotePrintJob(getter_AddRefs(remotePrintJob));
-      if (NS_SUCCEEDED(rv) && remotePrintJob) {
-        // If we have a RemotePrintJob add it to the print progress listeners,
-        // so it can forward to the parent.
-        printData->mPrintProgressListeners.AppendElement(remotePrintJob);
-        remotePrintJobListening = true;
-      }
     }
 
+    if (printData->mRemotePrintJob) {
+      // If we have a RemotePrintJob add it to the print progress listeners,
+      // so it can forward to the parent.
+      printData->mPrintProgressListeners.AppendElement(printData->mRemotePrintJob);
+      remotePrintJobListening = true;
+    }
   }
 
   if (aWebProgressListener != nullptr) {
     printData->mPrintProgressListeners.AppendObject(aWebProgressListener);
   }
 
   // Get the currently focused window and cache it
   // because the Print Dialog will "steal" focus and later when you try
@@ -874,30 +871,28 @@ nsPrintJob::DoCommonPrint(bool          
           return NS_ERROR_FAILURE;
         }
 
         if (NS_SUCCEEDED(rv)) {
           // since we got the dialog and it worked then make sure we
           // are telling GFX we want to print silent
           printSilently = true;
 
-          if (printData->mPrintSettings && !aIsPrintPreview) {
-            // The user might have changed shrink-to-fit in the print dialog, so update our copy of its state
-            printData->mPrintSettings->GetShrinkToFit(&printData->mShrinkToFit);
-
-            // If we haven't already added the RemotePrintJob as a listener,
-            // add it now if there is one.
+          if (!aIsPrintPreview) {
+            if (printData->mPrintSettings) {
+              // The user might have changed shrink-to-fit in the print dialog, so update our copy of its state
+              printData->mPrintSettings->GetShrinkToFit(&printData->mShrinkToFit);
+            }
+
+            // The ShowPrintDialog() call above may have created a
+            // RemotePrintJobChild if we didn't already have one.  In that case
+            // we won't have added it as a listener, so we need to do that now.
             if (!remotePrintJobListening) {
-              RefPtr<mozilla::layout::RemotePrintJobChild> remotePrintJob;
-              printSession->GetRemotePrintJob(getter_AddRefs(remotePrintJob));
-              if (NS_SUCCEEDED(rv) && remotePrintJob) {
-                printData->mPrintProgressListeners.AppendElement(
-                                                     remotePrintJob);
-                remotePrintJobListening = true;
-              }
+              printData->mPrintProgressListeners.AppendElement(printData->mRemotePrintJob);
+              remotePrintJobListening = true;
             }
           }
         } else if (rv == NS_ERROR_NOT_IMPLEMENTED) {
           // This means the Dialog service was there,
           // but they choose not to implement this dialog and
           // are looking for default behavior from the toolkit
           rv = NS_OK;
         }
@@ -3507,25 +3502,19 @@ nsPrintJob::StartPagePrintTimer(const Un
     NS_ENSURE_TRUE(cv, NS_ERROR_FAILURE);
     nsCOMPtr<nsIDocument> doc = cv->GetDocument();
     NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
     RefPtr<nsPagePrintTimer> timer =
       new nsPagePrintTimer(this, mDocViewerPrint, doc, printPageDelay);
     timer.forget(&mPagePrintTimer);
 
-    nsCOMPtr<nsIPrintSession> printSession;
-    nsresult rv = mPrt->mPrintSettings->GetPrintSession(getter_AddRefs(printSession));
-    if (NS_SUCCEEDED(rv) && printSession) {
-      RefPtr<mozilla::layout::RemotePrintJobChild> remotePrintJob;
-      printSession->GetRemotePrintJob(getter_AddRefs(remotePrintJob));
-      if (NS_SUCCEEDED(rv) && remotePrintJob) {
-        remotePrintJob->SetPagePrintTimer(mPagePrintTimer);
-        remotePrintJob->SetPrintJob(this);
-      }
+    if (mPrt->mRemotePrintJob) {
+      mPrt->mRemotePrintJob->SetPagePrintTimer(mPagePrintTimer);
+      mPrt->mRemotePrintJob->SetPrintJob(this);
     }
   }
 
   return mPagePrintTimer->Start(aPO.get());
 }
 
 /*=============== nsIObserver Interface ======================*/
 NS_IMETHODIMP