CRM-13331 re-apply email send once fix but in a way more true to original