This reverts commit 7e0cf56363. Conflicts: actionmailer/CHANGELOG.md See discussion at 7e0cf56363 (commitcomment-2075489)
7e0cf56363
7e0cf56363 (commitcomment-2075489)