The source project of this merge request has been removed.
Less invasive revert of 43857
this is a less invasive revert of !43857 (merged) than !43927 (merged). My local tests are still running, but that's the only place in the changed which could actually exchange the container. Let's see