Backport Emacs changes from r116063