Revert "Use new attribute storage plugin"

This reverts commit 418d9f5fecd05386728245b545640e4300f9dc92.
Add required fix undone by revert