Revert the last change.
Fix the problem with Emacs 24.3.