Regression: Address/email/phone IDs broken in Views integration

I think this regression was introduced by CRM-17468
PR: https://github.com/civicrm/civicrm-drupal/pull/323

We used to be able to use Address ID / Phone ID / Email ID as fields in CiviCRM's Views integration.

These fields no longer appear in the list, and any instances of it from before upgrading to 4.7 display 'Broken/missing handler'.

It doesn't seem that there was any upgrade notice/code to change how this works if a change in how we build Views was required.

It seems there are two conflicting ways to display contact's addresses using views now. Using the fields directly, or using the relationship. This seems like bad practice and we should be enforcing accessing these entities via the relationship if this is the new approach - we should 'deprecate' the old fields (but not delete them).

Even using the new relationships the address/phone/email IDs do not appear as a 'field' that can be added.