Fix for breakage in Emacs 24.4