rescue the coming Emacs 24.4.