Backport commit dc152c5 from Emacs