alternative approach

mondrakerequested to merge
issue/drupal-2371709:2371709-use-events-II into main

Closes #2371709

Merge request reports