Primary Email and Primary Phone Number at Different Locations (ie. Home and Work) causes duplicate Profile listings

Reproduced on the demo site:
http://drupal.demo.civicrm.org/civicrm/profile/?gid=9&force=1&search=1&reset=1

Per Dave Greenberg's suggestion, we should have non-duplication when a Contact has only one Primary Email and one Primary Phone, yet these two Primaries are at different locations (Home vs. Work).

Here is an example contact:
http://drupal.demo.civicrm.org/civicrm/contact/add?reset=1&action=update&cid=166

A Contact could feasibly prefer to use their home email but their work phone number, this is reasonable. Can we prevent duplcates on the Profile listing?