PR Summary

Fixes #22622
Closes #22773 (easier to start all over than to restore everything there)

Before (for test case):

Now:

Thanks @jklymak for coming up with a much better and easier solution than the one proposed in #22773

PR Checklist

Tests and Styling

• Has pytest style unit tests (and pytest passes).
• Is Flake 8 compliant (install flake8-docstrings and run flake8 --docstring-convention=all).

Documentation

• [N/A] New features are documented, with examples if plot related.
• [N/A] New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
• [N/A] API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).
• [N/A] Documentation is sphinx and numpydoc compliant (the docs should build without error).