Don't use frame-restore in Emacs HEAD