CRM-15711 - Improve efficiency of deleting a contact