Revert "Attributes"

This reverts commit 102c7a76998365b27d63732cd61563b89e1e4d46.
Revert "Revert "Attributes""

This reverts commit b20d60ac620537121bd588b98a95fa467b687c3a.