Issue #3454274 by Lillian Bozeman, markconroy: Don't step on all of the other classes

Mark Conroyrequested to merge
issue/drupal-3454274:3454274-dont-step-on into 11.x

Closes #3454274

Merge request reports