Backport commit eeecac7 from Emacs