Revert "fix(a3p-integration): workaround zoe issues"

This reverts commit fb74bbd.

a3p-integration/proposals/a:upgrade-next/probeZcfBundleCap.test.js

@@ -24,4 +24,13 @@ test('upgrade Zoe to verify ZcfBundleCap endures', async t => {
     detailsBefore.incarnation + 2,
     'wf incarnation must increase by 2',
   );
+
+  // The test restarts the WalletFactory, so it'll use the recently assigned
+  // ZCF bundle. It then restarts Zoe, so it'll revert to whichever ZCF bundle
+  // made it to persistent store. We then restart the Wallet Factory and see if
+  // it's gone back to the ZCF that Zoe initially knew about. If we could get the
+  // ZCF bundleID here from the probe, we'd explicitly check for that. Instead,
+  // we have to be content that it did indeed use the newly assigned bundle in
+  // manual tests.
+  t.not(detailsAfter.bundleID, detailsBefore.bundleID);
 });

packages/vats/src/proposals/probeZcfBundle.js

@@ -48,9 +48,7 @@ export const probeZcfBundleCap = async (
   await E(adminNode).upgrade(zoeBundleCap, {});
 
   // STEP 4: restart WF ////////////////////////
-  // Need to use `upgradeContract` instead of `restartContract`
-  // See https://github.com/Agoric/agoric-sdk/issues/9249
-  await E(walletAdminFacet).upgradeContract(walletRef.bundleID, privateArgs);
+  await E(walletAdminFacet).restartContract(privateArgs);
 
   // //////  See which zcf bundle was used //////////
 };