Reverted to embedded association.