Revert "SERVER-92457: Pushdown $group if entire shard key is specified in equalities in _id (#28721)" (#30061)

GitOrigin-RevId: 6010c4b8b5956cb28edd7d98557279ff46054a96

Author: auto-revert-app[bot]

jstests/aggregation/accumulators/accumulator_js_size_limits.js

@@ -111,10 +111,7 @@ res = runExample("$_id",
                      lang: 'js',
                  },
                  {allowDiskUse: false});
-// If featureFlagShardFilteringDistinctScan is on, we will push this $group down to shards on
-// sharded collection passthrough suites, and may run out of space during JS execution of init().
-assert.commandFailedWithCode(
-    res, [ErrorCodes.QueryExceededMemoryLimitNoDiskUseAllowed, ErrorCodes.JSInterpreterFailure]);
+assert.commandFailedWithCode(res, [ErrorCodes.QueryExceededMemoryLimitNoDiskUseAllowed]);
 
 // Verify that having large number of documents doesn't cause the $accumulator to run out of memory.
 coll.drop();

jstests/query_golden/expected_output/distinct_aggregation_multiplanning.md

@@ -2721,7 +2721,6 @@ Execution Engine: classic
 		},
 		{
 			"$group" : {
-				"$willBeMerged" : false,
 				"_id" : "$a",
 				"accum" : {
 					"$top" : {
@@ -2881,7 +2880,6 @@ Execution Engine: classic
 		},
 		{
 			"$group" : {
-				"$willBeMerged" : false,
 				"_id" : "$a",
 				"accum" : {
 					"$top" : {