Revert "SERVER-59495 Donor and recipient tenant migration state machines will persist the migration protocol info and tenantId info will be an empty string for 'Merge' protocol."

This reverts commit bbc96fbba2deaac539165bcd86bbdaf6037f41dd.

1 files changed, 1 insertions, 9 deletions

diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js
index 19a5e7eae83..a7881fef8aa 100644
--- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js
+++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js
@@ -52,9 +52,6 @@ function runTest(downgradeFCV) {
     migrationThread.start();
     hangAfterSavingFCV.wait();
 
-    const isRunningMergeProtocol =
-        (TenantMigrationUtil.isShardMergeEnabled(recipientDb)) ? true : false;
-
     // Downgrade the FCV for the recipient set.
     assert.commandWorked(
         recipientPrimary.adminCommand({setFeatureCompatibilityVersion: downgradeFCV}));
@@ -69,12 +66,7 @@ function runTest(downgradeFCV) {
 
     // The migration will not be able to continue in the downgraded version.
     TenantMigrationTest.assertAborted(migrationThread.returnData());
-    // Change-of-FCV detection message.
-    if (isRunningMergeProtocol) {
-        checkLog.containsJson(newRecipientPrimary, 5949504);
-    } else {
-        checkLog.containsJson(newRecipientPrimary, 5356200);
-    }
+    checkLog.containsJson(newRecipientPrimary, 5356200);  // Change-of-FCV detection message.
 
     tenantMigrationTest.stop();
     recipientRst.stopSet();