commented out check for name field being "Primary:" since it seems like it was only breaking some cases but not helping any others