Revert "Fixed #2943 Correct subquery aggregation approach"

This reverts commit 6e2785ddfcb73545c12e573354f846a2e9c53b0c.