Undo part of the multi-tty change, which is only needed if server.el is preloaded, and broke server-running-p. (server-socket-dir): Initialize in the defvar, as before. (server-start): Remove initialization of server-socket-dir.