diff -r 26f0a318aedb -r 125674651465 tex-site.el.in
--- a/tex-site.el.in	Tue Jun 03 14:10:34 2014 +0900
+++ b/tex-site.el.in	Fri Apr 22 15:22:33 2016 +0900
@@ -87,6 +87,8 @@
 
 (add-hook 'tex-site-unload-hook
 	  (lambda ()
+	    (if (fboundp 'advice-add)
+		(TeX-modes-set 'TeX-modes nil)
 	    (let ((list after-load-alist))
 	      (while list
 		;; Adapted copy of the definition of `assq-delete-all'
@@ -101,7 +103,7 @@
 			     (eq (car (car tail)) key))
 			(setq alist (delq (car tail) alist)))
 		    (setq tail (cdr tail))))
-		(setq list (cdr list))))
+		(setq list (cdr list)))))
 	    (setq load-path (delq TeX-lisp-directory load-path))))
 
 (defun TeX-modes-set (var value &optional update)