rolled back c1969f3 & c56b1a8 (user-emacs-directory); It screws up revive mode;