Revert "Attributes isolated"

This reverts commit f46992e3b1955ae7e1a1a1de38826e683feddf92.