Bundle permissions not working correctly

The [op] any [entity_type] entity of bundle [bundle_name] is not working, at least on the create/edit pages. It appears that the second value in crm_core_contact_access() and crm_core_activity_access() is the contact_id, so line 280 in crm_core_contact.module is setting the $contact_type to the entities id.

if (is_object($contact)) {
    $contact_type = $contact->type;
  }
  else {
    $contact_type = $contact;
  }

So the bundle specific permissions are returning false unless the user has the global any permission:

$delete_any_contact = user_access('delete any crm_core_contact entity', $account);
$delete_type_contact = user_access('delete any crm_core_contact entity of bundle ' . $contact_type, $account);

This is most noticeable with the delete action as there is no Delete any [bundle] [entity_type] permission.
I'm not sure if this is the correct way to do it but it solve the issue for me. I added this to line 283 of crm_core_contact.module. I'll submit a patch shortly.

if (is_object($contact)) {
    $contact_type = $contact->type;
  }
  elseif (is_numeric($contact)) {
    $contact = crm_core_contact_load($contact);
    $contact_type = $contact->type;
  }
  else {
    $contact_type = $contact;
  }