Backport commit 25166a91 from Emacs master branch.