Revert "Merge branch 'fix-layers-map-in-forward' into 'main'"

This reverts merge request !65432 (merged) due to issues reported in: ATR-28212

It seems we realy need a different approach (new mapping files).