Revert "Address feedback"

nicxvanrequested to merge
issue/drupal-3624282:3624282-attributes-only into main

This reverts commit 582b35f0.

Closes #3624282

Merge request reports