Change for Emacs 24.4