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

This reverts commit eee3004e4270ad814c71ac8df1d22ce04508e32b.
Issue #2195583 by DanChadwick: Submission token values duplicating in custom email template.