switch to public_id (bug 834344)