chore: revert the #1703 squash so the four fixes can be re-landed separately - #1880

Commit scanned: 1

• Pull request #1880: chore/1703-split-prep 👉 main

🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.