diff --git a/src/cmd/factory/impl/common.go b/src/cmd/factory/impl/common.go
index 6c69e661f..85665d825 100644
--- a/src/cmd/factory/impl/common.go
+++ b/src/cmd/factory/impl/common.go
@@ -111,7 +111,14 @@ func generateAndRestoreItems(
 		Selector:          sel,
 	}
 
-	return ctrl.ConsumeRestoreCollections(ctx, rcc, dataColls, errs, ctr)
+	deets, _, err := ctrl.ConsumeRestoreCollections(
+		ctx,
+		rcc,
+		dataColls,
+		errs,
+		ctr)
+
+	return deets, clues.Wrap(err, "restoring items").OrNil()
 }
 
 // ------------------------------------------------------------------------------------------
@@ -455,5 +462,12 @@ func generateAndRestoreDriveItems(
 		Selector:          sel,
 	}
 
-	return ctrl.ConsumeRestoreCollections(ctx, rcc, collections, errs, ctr)
+	deets, _, err := ctrl.ConsumeRestoreCollections(
+		ctx,
+		rcc,
+		collections,
+		errs,
+		ctr)
+
+	return deets, clues.Wrap(err, "restoring items").OrNil()
 }
diff --git a/src/internal/m365/controller_test.go b/src/internal/m365/controller_test.go
index 6fe930c1a..b75b08bb6 100644
--- a/src/internal/m365/controller_test.go
+++ b/src/internal/m365/controller_test.go
@@ -520,7 +520,7 @@ func (suite *ControllerIntegrationSuite) TestEmptyCollections() {
 				Selector:          test.sel,
 			}
 
-			deets, err := suite.ctrl.ConsumeRestoreCollections(
+			deets, _, err := suite.ctrl.ConsumeRestoreCollections(
 				ctx,
 				rcc,
 				test.col,
@@ -562,7 +562,7 @@ func runRestore(
 		Selector:          restoreSel,
 	}
 
-	deets, err := restoreCtrl.ConsumeRestoreCollections(
+	deets, status, err := restoreCtrl.ConsumeRestoreCollections(
 		ctx,
 		rcc,
 		collections,
@@ -571,7 +571,6 @@ func runRestore(
 	require.NoError(t, err, clues.ToCore(err))
 	assert.NotNil(t, deets)
 
-	status := restoreCtrl.Wait()
 	runTime := time.Since(start)
 
 	assert.Equal(t, numRestoreItems, status.Objects, "restored status.Objects")
@@ -1195,7 +1194,7 @@ func (suite *ControllerIntegrationSuite) TestMultiFolderBackupDifferentNames() {
 					Selector:          restoreSel,
 				}
 
-				deets, err := restoreCtrl.ConsumeRestoreCollections(
+				deets, status, err := restoreCtrl.ConsumeRestoreCollections(
 					ctx,
 					rcc,
 					collections,
@@ -1204,7 +1203,6 @@ func (suite *ControllerIntegrationSuite) TestMultiFolderBackupDifferentNames() {
 				require.NoError(t, err, clues.ToCore(err))
 				require.NotNil(t, deets)
 
-				status := restoreCtrl.Wait()
 				// Always just 1 because it's just 1 collection.
 				assert.Equal(t, totalItems, status.Objects, "status.Objects")
 				assert.Equal(t, totalItems, status.Successes, "status.Successes")
diff --git a/src/internal/m365/mock/connector.go b/src/internal/m365/mock/connector.go
index 50c2fd092..49c2711e0 100644
--- a/src/internal/m365/mock/connector.go
+++ b/src/internal/m365/mock/connector.go
@@ -76,8 +76,8 @@ func (ctrl Controller) ConsumeRestoreCollections(
 	_ []data.RestoreCollection,
 	_ *fault.Bus,
 	_ *count.Bus,
-) (*details.Details, error) {
-	return ctrl.Deets, ctrl.Err
+) (*details.Details, *data.CollectionStats, error) {
+	return ctrl.Deets, &ctrl.Stats, ctrl.Err
 }
 
 func (ctrl Controller) CacheItemInfo(dii details.ItemInfo) {}
diff --git a/src/internal/m365/restore.go b/src/internal/m365/restore.go
index 205f068e4..2b732909f 100644
--- a/src/internal/m365/restore.go
+++ b/src/internal/m365/restore.go
@@ -12,7 +12,6 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/service/groups"
 	"github.com/alcionai/corso/src/internal/m365/service/onedrive"
 	"github.com/alcionai/corso/src/internal/m365/service/sharepoint"
-	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/pkg/backup/details"
 	"github.com/alcionai/corso/src/pkg/count"
@@ -23,14 +22,13 @@ import (
 
 // ConsumeRestoreCollections restores data from the specified collections
 // into M365 using the GraphAPI.
-// SideEffect: status is updated at the completion of operation
 func (ctrl *Controller) ConsumeRestoreCollections(
 	ctx context.Context,
 	rcc inject.RestoreConsumerConfig,
 	dcs []data.RestoreCollection,
 	errs *fault.Bus,
 	ctr *count.Bus,
-) (*details.Details, error) {
+) (*details.Details, *data.CollectionStats, error) {
 	ctx, end := diagnostics.Span(ctx, "m365:restore")
 	defer end()
 
@@ -38,19 +36,19 @@ func (ctrl *Controller) ConsumeRestoreCollections(
 	ctx = clues.Add(ctx, "restore_config", rcc.RestoreConfig)
 
 	if len(dcs) == 0 {
-		return nil, clues.New("no data collections to restore")
+		return nil, nil, clues.New("no data collections to restore")
 	}
 
 	var (
 		service = rcc.Selector.PathService()
-		status  *support.ControllerOperationStatus
+		stats   *data.CollectionStats
 		deets   *details.Details
 		err     error
 	)
 
 	switch service {
 	case path.ExchangeService:
-		deets, status, err = exchange.ConsumeRestoreCollections(
+		deets, stats, err = exchange.ConsumeRestoreCollections(
 			ctx,
 			ctrl.AC,
 			rcc,
@@ -58,7 +56,7 @@ func (ctrl *Controller) ConsumeRestoreCollections(
 			errs,
 			ctr)
 	case path.OneDriveService:
-		deets, status, err = onedrive.ConsumeRestoreCollections(
+		deets, stats, err = onedrive.ConsumeRestoreCollections(
 			ctx,
 			drive.NewUserDriveRestoreHandler(ctrl.AC),
 			rcc,
@@ -67,7 +65,7 @@ func (ctrl *Controller) ConsumeRestoreCollections(
 			errs,
 			ctr)
 	case path.SharePointService:
-		deets, status, err = sharepoint.ConsumeRestoreCollections(
+		deets, stats, err = sharepoint.ConsumeRestoreCollections(
 			ctx,
 			rcc,
 			ctrl.AC,
@@ -76,7 +74,7 @@ func (ctrl *Controller) ConsumeRestoreCollections(
 			errs,
 			ctr)
 	case path.GroupsService:
-		deets, status, err = groups.ConsumeRestoreCollections(
+		deets, stats, err = groups.ConsumeRestoreCollections(
 			ctx,
 			rcc,
 			ctrl.AC,
@@ -89,8 +87,5 @@ func (ctrl *Controller) ConsumeRestoreCollections(
 		err = clues.Wrap(clues.New(service.String()), "service not supported")
 	}
 
-	ctrl.incrementAwaitingMessages()
-	ctrl.UpdateStatus(status)
-
-	return deets, err
+	return deets, stats, err
 }
diff --git a/src/internal/m365/service/exchange/restore.go b/src/internal/m365/service/exchange/restore.go
index b13e2087c..40cd88347 100644
--- a/src/internal/m365/service/exchange/restore.go
+++ b/src/internal/m365/service/exchange/restore.go
@@ -26,9 +26,9 @@ func ConsumeRestoreCollections(
 	dcs []data.RestoreCollection,
 	errs *fault.Bus,
 	ctr *count.Bus,
-) (*details.Details, *support.ControllerOperationStatus, error) {
+) (*details.Details, *data.CollectionStats, error) {
 	if len(dcs) == 0 {
-		return nil, support.CreateStatus(ctx, support.Restore, 0, support.CollectionMetrics{}, ""), nil
+		return nil, nil, clues.New("no data collections to restore")
 	}
 
 	var (
@@ -119,5 +119,5 @@ func ConsumeRestoreCollections(
 		metrics,
 		rcc.RestoreConfig.Location)
 
-	return deets.Details(), status, el.Failure()
+	return deets.Details(), status.ToCollectionStats(), el.Failure()
 }
diff --git a/src/internal/m365/service/groups/restore.go b/src/internal/m365/service/groups/restore.go
index 61652c73e..50947cb71 100644
--- a/src/internal/m365/service/groups/restore.go
+++ b/src/internal/m365/service/groups/restore.go
@@ -34,7 +34,7 @@ func ConsumeRestoreCollections(
 	dcs []data.RestoreCollection,
 	errs *fault.Bus,
 	ctr *count.Bus,
-) (*details.Details, *support.ControllerOperationStatus, error) {
+) (*details.Details, *data.CollectionStats, error) {
 	var (
 		deets             = &details.Builder{}
 		restoreMetrics    support.CollectionMetrics
@@ -136,7 +136,7 @@ func ConsumeRestoreCollections(
 		restoreMetrics,
 		rcc.RestoreConfig.Location)
 
-	return deets.Details(), status, el.Failure()
+	return deets.Details(), status.ToCollectionStats(), el.Failure()
 }
 
 func getSiteName(
diff --git a/src/internal/m365/service/onedrive/restore.go b/src/internal/m365/service/onedrive/restore.go
index 57e348757..58b10dcfe 100644
--- a/src/internal/m365/service/onedrive/restore.go
+++ b/src/internal/m365/service/onedrive/restore.go
@@ -28,7 +28,7 @@ func ConsumeRestoreCollections(
 	dcs []data.RestoreCollection,
 	errs *fault.Bus,
 	ctr *count.Bus,
-) (*details.Details, *support.ControllerOperationStatus, error) {
+) (*details.Details, *data.CollectionStats, error) {
 	var (
 		deets             = &details.Builder{}
 		restoreMetrics    support.CollectionMetrics
@@ -91,7 +91,7 @@ func ConsumeRestoreCollections(
 		restoreMetrics,
 		rcc.RestoreConfig.Location)
 
-	return deets.Details(), status, el.Failure()
+	return deets.Details(), status.ToCollectionStats(), el.Failure()
 }
 
 // Augment restore path to add extra files(meta) needed for restore as
diff --git a/src/internal/m365/service/sharepoint/restore.go b/src/internal/m365/service/sharepoint/restore.go
index 2c31b4aa2..56c77f348 100644
--- a/src/internal/m365/service/sharepoint/restore.go
+++ b/src/internal/m365/service/sharepoint/restore.go
@@ -30,7 +30,7 @@ func ConsumeRestoreCollections(
 	dcs []data.RestoreCollection,
 	errs *fault.Bus,
 	ctr *count.Bus,
-) (*details.Details, *support.ControllerOperationStatus, error) {
+) (*details.Details, *data.CollectionStats, error) {
 	var (
 		deets          = &details.Builder{}
 		lrh            = drive.NewSiteRestoreHandler(ac, rcc.Selector.PathService())
@@ -118,5 +118,5 @@ func ConsumeRestoreCollections(
 		restoreMetrics,
 		rcc.RestoreConfig.Location)
 
-	return deets.Details(), status, el.Failure()
+	return deets.Details(), status.ToCollectionStats(), el.Failure()
 }
diff --git a/src/internal/m365/support/status.go b/src/internal/m365/support/status.go
index 5e85857eb..41790452b 100644
--- a/src/internal/m365/support/status.go
+++ b/src/internal/m365/support/status.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 
 	"github.com/dustin/go-humanize"
+
+	"github.com/alcionai/corso/src/internal/data"
 )
 
 // ControllerOperationStatus is a data type used to describe the state of
@@ -105,3 +107,18 @@ func (cos *ControllerOperationStatus) String() string {
 		operationStatement,
 		cos.details)
 }
+
+// ToCollectionStats turns the called ControllerOperationStatus into a
+// *data.CollectionStats instance
+//
+// TODO(ashmrtn): Remove this when we rework status handling. It's really here
+// to avoid repeated code in each service handler.
+func (cos ControllerOperationStatus) ToCollectionStats() *data.CollectionStats {
+	return &data.CollectionStats{
+		Folders:   cos.Folders,
+		Objects:   cos.Metrics.Objects,
+		Successes: cos.Metrics.Successes,
+		Bytes:     cos.Metrics.Bytes,
+		Details:   cos.String(),
+	}
+}
diff --git a/src/internal/operations/inject/inject.go b/src/internal/operations/inject/inject.go
index 52f50fce2..8007065b0 100644
--- a/src/internal/operations/inject/inject.go
+++ b/src/internal/operations/inject/inject.go
@@ -61,7 +61,7 @@ type (
 			dcs []data.RestoreCollection,
 			errs *fault.Bus,
 			ctr *count.Bus,
-		) (*details.Details, error)
+		) (*details.Details, *data.CollectionStats, error)
 
 		IsServiceEnableder
 
diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go
index 514c592c0..2d5e255cb 100644
--- a/src/internal/operations/restore.go
+++ b/src/internal/operations/restore.go
@@ -304,7 +304,7 @@ func (op *RestoreOperation) do(
 	opStats.resourceCount = 1
 	opStats.cs = dcs
 
-	deets, err = consumeRestoreCollections(
+	deets, colStats, err := consumeRestoreCollections(
 		ctx,
 		op.rc,
 		bup.Version,
@@ -319,7 +319,7 @@ func (op *RestoreOperation) do(
 		return nil, clues.Stack(err)
 	}
 
-	opStats.ctrl = op.rc.Wait()
+	opStats.ctrl = colStats
 
 	logger.Ctx(ctx).Debug(opStats.ctrl)
 
@@ -392,7 +392,7 @@ func consumeRestoreCollections(
 	dcs []data.RestoreCollection,
 	errs *fault.Bus,
 	ctr *count.Bus,
-) (*details.Details, error) {
+) (*details.Details, *data.CollectionStats, error) {
 	progressBar := observe.MessageWithCompletion(ctx, observe.ProgressCfg{}, "Restoring data")
 	defer close(progressBar)
 
@@ -404,12 +404,9 @@ func consumeRestoreCollections(
 		Selector:          sel,
 	}
 
-	deets, err := rc.ConsumeRestoreCollections(ctx, rcc, dcs, errs, ctr)
-	if err != nil {
-		return nil, clues.Wrap(err, "restoring collections")
-	}
+	deets, status, err := rc.ConsumeRestoreCollections(ctx, rcc, dcs, errs, ctr)
 
-	return deets, nil
+	return deets, status, clues.Wrap(err, "restoring collections").OrNil()
 }
 
 // formatDetailsForRestoration reduces the provided detail entries according to the
diff --git a/src/internal/operations/test/helper_test.go b/src/internal/operations/test/helper_test.go
index 22dc48ea8..2bf3bd964 100644
--- a/src/internal/operations/test/helper_test.go
+++ b/src/internal/operations/test/helper_test.go
@@ -590,7 +590,7 @@ func generateContainerOfItems(
 		Selector:          sel,
 	}
 
-	deets, err := ctrl.ConsumeRestoreCollections(
+	deets, _, err := ctrl.ConsumeRestoreCollections(
 		ctx,
 		rcc,
 		dataColls,
@@ -598,10 +598,6 @@ func generateContainerOfItems(
 		count.New())
 	require.NoError(t, err, clues.ToCore(err))
 
-	// have to wait here, both to ensure the process
-	// finishes, and also to clean up the status
-	ctrl.Wait()
-
 	return deets
 }