We have a solution for this problem. It is part of the group of related changes that we are making in our transition to Drupal 10. We do not have an implementation date because some of the related updates do not have stable Drupal 10 releases yet, but we will apply them as soon as they are available.