Revert "Re-organize new jet config"
This reverts commits d25bb941 and bbef9cdd from MR !43749 (merged) and MR !43939 (merged) just in case no better solution is found in parallel.
RC: please do not merge without prior further discussions
This reverts commits d25bb941 and bbef9cdd from MR !43749 (merged) and MR !43939 (merged) just in case no better solution is found in parallel.
RC: please do not merge without prior further discussions