Try to add UUIDs back in.