Revert "Optimized attribute definition creation"

This reverts commit bf3a98759271556c107d9c1317c76c690f717fc0.