Restore compatibility with Emacs 24.2