add back some code that was needed in PersonPicker