Revert "SERVER-41065 Make evaluate() thread safe by passing 'Variables' as a parameter"

This reverts commit 17cdb38b6db716dc47485a60ddff3c543e713e3d.

1 files changed, 1 insertions, 6 deletions

diff --git a/src/mongo/db/matcher/expression_expr.cpp b/src/mongo/db/matcher/expression_expr.cpp
index f356c4aa25b..f58c1c14ef8 100644
--- a/src/mongo/db/matcher/expression_expr.cpp
+++ b/src/mongo/db/matcher/expression_expr.cpp
@@ -53,13 +53,8 @@ bool ExprMatchExpression::matches(const MatchableDocument* doc, MatchDetails* de
     }
 
     Document document(doc->toBSON());
-
-    // 'Variables' is not thread safe, and ExprMatchExpression may be used in a validator which
-    // processes documents from multiple threads simultaneously. Hence we make a copy of the
-    // 'Variables' object per-caller.
-    Variables variables = _expCtx->variables;
     try {
-        auto value = _expression->evaluate(document, &variables);
+        auto value = _expression->evaluate(document);
         return value.coerceToBool();
     } catch (const DBException&) {
         if (MONGO_FAIL_POINT(ExprMatchExpressionMatchesReturnsFalseOnException)) {