Switched back to using emacs from emacsclient