SERVER-19564: revert

3 files changed, 7 insertions, 6 deletions

diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index b96dc4888c8..62b17b562f6 100644
--- a/src/mongo/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
@@ -694,7 +694,7 @@ void State::insert(const string& ns, const BSONObj& o) {
         b.appendElements(o);
         BSONObj bo = b.obj();
 
-        uassertStatusOK(coll->insertDocument(_txn, bo, true));
+        uassertStatusOK(coll->insertDocument(_txn, bo, true).getStatus());
         wuow.commit();
     }
     MONGO_WRITE_CONFLICT_RETRY_LOOP_END(_txn, "M/R insert", ns);
@@ -713,7 +713,7 @@ void State::_insertToInc(BSONObj& o) {
         bool shouldReplicateWrites = _txn->writesAreReplicated();
         _txn->setReplicatedWrites(false);
         ON_BLOCK_EXIT(&OperationContext::setReplicatedWrites, _txn, shouldReplicateWrites);
-        uassertStatusOK(coll->insertDocument(_txn, o, true, false));
+        uassertStatusOK(coll->insertDocument(_txn, o, true, false).getStatus());
         wuow.commit();
     }
     MONGO_WRITE_CONFLICT_RETRY_LOOP_END(_txn, "M/R insertToInc", _config.incLong);
diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp
index e9ec6a34793..733b3b19cee 100644
--- a/src/mongo/db/commands/test_commands.cpp
+++ b/src/mongo/db/commands/test_commands.cpp
@@ -100,11 +100,12 @@ public:
                 return false;
             }
         }
-        Status status = collection->insertDocument(txn, obj, false);
+        StatusWith<RecordId> res = collection->insertDocument(txn, obj, false);
+        Status status = res.getStatus();
         if (status.isOK()) {
             wunit.commit();
         }
-        return appendCommandStatus(result, status);
+        return appendCommandStatus(result, res.getStatus());
     }
 };
 
diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
index ea7920b284f..f87912a1c6c 100644
--- a/src/mongo/db/commands/write_commands/batch_executor.cpp
+++ b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -1084,10 +1084,10 @@ static void singleInsert(OperationContext* txn,
     dassert(txn->lockState()->isCollectionLockedForMode(insertNS, MODE_IX));
 
     WriteUnitOfWork wunit(txn);
-    Status status = collection->insertDocument(txn, docToInsert, true);
+    StatusWith<RecordId> status = collection->insertDocument(txn, docToInsert, true);
 
     if (!status.isOK()) {
-        result->setError(toWriteError(status));
+        result->setError(toWriteError(status.getStatus()));
     } else {
         result->getStats().n = 1;
         wunit.commit();