Back-out timed-out changes. This is just a failing of Emacs (or a failing of us to understand Emacs)