Revert "Backport revno 111277 from Emacs trunk."