CRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled
Merge pull request #1728 from demeritcowboy/CRM-13444

CRM-13444: undo CRM-13445 and prevent archived mailing appearing as sche...