Reverted "Fixed #26434 -- Removed faulty clearing of ordering field when missing from explicit grouping."

This reverts commit ea3a71c2d09f8281d8a50ed20e40e1fb13db5cd9.

The implementation was flawed, as self.group_by contains Cols, not aliases.

1 files changed, 1 insertions, 7 deletions

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 8f9349e7eb..84950d4ec0 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -2346,13 +2346,7 @@ class Query(BaseExpression):
         query (not even the model's default).
         """
         if not force and (
-            self.is_sliced
-            or self.distinct_fields
-            or self.select_for_update
-            or (
-                isinstance(self.group_by, tuple)
-                and not {*self.order_by, *self.extra_order_by}.issubset(self.group_by)
-            )
+            self.is_sliced or self.distinct_fields or self.select_for_update
         ):
             return
         self.order_by = ()