Repair damage from emacs-25 merge