Restore behavior change by reverting #2527

[iche033]

🦟 Bug fix

Summary

#2527 reverted the changes introduced in #2452 because it's a behavior breaking change.

This PR restores the behavior change for main by undoing the changes in #2527.

Checklist

• Signed all commits for DCO
• Added tests
• Updated documentation (as needed)
• Updated migration guide (as needed)
• Consider updating Python bindings (if the library has them)
• codecheck passed (See contributing)
• All tests passed (See test coverage)
• While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.