Backport commit 5bdc97d55 from Emacs