Revert "Merge branch 'approvers-view' into 'main'"

Description

This MR reverts changes from !996 (merged) because they broke our test suite.

@kerrizor Would you mind reviewing this MR? The main branch CI has been broken for a week, and I think that the best way forward will be reverting !996 (merged) to unblock other MRs.

@shaun35 sorry for having to revert the MR. 🙁 When you have time to look at the failing test, please re-submit the whole MR. Ideally if you could introduce the test fix in one extra commit so the reviewer can only review only that (because the rest of your MR is already reviewed and approved)

Resolves #1023 (closed)