Backport fix for twilio templates