For now, revert previous rmail.el change