This reverts commit c3f94fd7f76f377e4728c715abbb8c7846e9fb25.
The specified commit is working fine for CI and development, but contains performance
degredation (solved in a follow-up pr) that we want to avoid for the next release. This
rever is temporary, and the changes will be re-instated after release.
---
#### Does this PR need a docs update or release note?
- [x] ⛔ No
#### Type of change
- [x] 🤖 Supportability/Tests
#### Test Plan
- [x] ⚡ Unit test
- [x] 💚 E2E
3d78183651