Add change missed from previous merge from emacs-24