Revert "Merge branch 'master-jetchainconfig2' into 'master'"

This reverts merge request !21470 (merged)

It should be re-added after protection against breaking the legacy trigger are introduced.