Backport commit 2c05061 from Emacs