From 2bf78c35f323700c1daa3808dccab351c3fe5b14 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 13 Dec 2016 12:39:50 -0800
Subject: [PATCH] Revert "Format email addresses w/Email::Address instead of
 ad-hoc, fixes issues emailing companies with commas, RT#73241"

This reverts commit 145bc8c83c8a132e5cd171a34b0f45948674d535.
---
 FS/FS/cust_main.pm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 51bde33fa..ec5f4ff13 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -20,17 +20,16 @@ use base qw( FS::cust_main::Packages
 require 5.006;
 use strict;
 use Carp;
-use Try::Tiny;
 use Scalar::Util qw( blessed );
-use List::Util qw(min);
-use Tie::IxHash;
-use File::Temp; #qw( tempfile );
-use Data::Dumper;
 use Time::Local qw(timelocal);
+use Data::Dumper;
+use Tie::IxHash;
 use Date::Format;
 #use Date::Manip;
-use Email::Address;
+use File::Temp; #qw( tempfile );
 use Business::CreditCard 0.28;
+use List::Util qw(min);
+use Try::Tiny;
 use FS::UID qw( dbh driver_name );
 use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
 use FS::Cursor;
@@ -3061,9 +3060,8 @@ sub contact_list_email {
   my @emails;
   foreach my $contact (@contacts) {
     foreach my $contact_email ($contact->contact_email) {
-      push @emails,  Email::Address->new( $contact->firstlast,
-                                          $contact_email->emailaddress
-                     )->format;
+      push @emails,
+        $contact->firstlast . ' <' . $contact_email->emailaddress . '>';
     }
   }
   @emails;
-- 
2.11.0