Revert "CRM-17908: text version of header/footer not used when auto-generatin…"