Issue #2195583 by DanChadwick: Submission token values duplicating in custom email template.