diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index a85f669fca9..19b8bc68d6f 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -3626,11 +3626,11 @@ Of course, we really can't know that for sure, so it's just a heuristic."
         (let* ((name (symbol-name type))
                (namep (intern (concat name "p"))))
           (cond
-           ;; ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val)))
-           ;; ((cl--macroexp-fboundp
-           ;;   (setq namep (intern (concat name "-p"))))
-           ;;  (inline-quote (funcall #',namep ,val)))
-           ;; ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val)))
+           ((cl--macroexp-fboundp namep) (inline-quote (funcall #',namep ,val)))
+           ((cl--macroexp-fboundp
+             (setq namep (intern (concat name "-p"))))
+            (inline-quote (funcall #',namep ,val)))
+           ((cl--macroexp-fboundp type) (inline-quote (funcall #',type ,val)))
            (t (error "Unknown type %S" type))))
         nil nil type))
       (type (error "Bad type spec: %S" type)))))