Backport change from Emacs r115884