back out of old emacs-24 because of dependency on subr.el declare