Revert "SERVER-32645 Create a shim helper framework."

This reverts commit 2227f272a7a0a3e43625cb2d4a2704e1ccb6f893.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/db/index_builder.cpp b/src/mongo/db/index_builder.cpp
index d915fc6590b..ab927cfc54b 100644
--- a/src/mongo/db/index_builder.cpp
+++ b/src/mongo/db/index_builder.cpp
@@ -98,7 +98,7 @@ void IndexBuilder::run() {
     Lock::DBLock dlk(opCtx.get(), ns.db(), MODE_X);
     OldClientContext ctx(opCtx.get(), ns.getSystemIndexesCollection());
 
-    Database* db = DatabaseHolder::getDatabaseHolder().get(opCtx.get(), ns.db().toString());
+    Database* db = dbHolder().get(opCtx.get(), ns.db().toString());
 
     Status status = _build(opCtx.get(), db, true, &dlk);
     if (!status.isOK()) {
@@ -210,7 +210,7 @@ Status IndexBuilder::_build(OperationContext* opCtx,
 
     if (allowBackgroundBuilding) {
         dbLock->relockWithMode(MODE_X);
-        Database* reloadDb = DatabaseHolder::getDatabaseHolder().get(opCtx, ns.db());
+        Database* reloadDb = dbHolder().get(opCtx, ns.db());
         fassert(28553, reloadDb);
         fassert(28554, reloadDb->getCollection(opCtx, ns));
     }