Backport commit 65c8c7c from Emacs