VE-1598: Revert change (.data->.attr->.data) that is not longer needed