Draft: #3496257 pre simplification

Dave Longrequested to merge
issue/drupal-3496257:3496257-pre-simplification into main

Closes #3496257

Merge request reports