Draft: Revert "Merge branch 'flags-jets' into 'master'"

This reverts merge request !60614 (merged) - do not event look at it, we do it to try out something