[8.x] Revert "[8.x] Fix attributes returning a collection instead of an array"

[8.x] Revert "[8.x] Fix attributes returning a collection instead of an array" #662