Revert "missing underscore"

This reverts commit fb79f18592fefa766d0c5217ee67ca4807050655.
Revert "merge pommespanzer-group-attributes"

This reverts commit fa368ff1d245e80a19c1ee4ebeb19d881734f70d, reversing
changes made to c818a8ce37674e2b3916d500bb56920357acacf4.