diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index feef8efb9e4..d508cbf238c 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -481,9 +481,6 @@ again:
 	PROC_LOCK(p1);
 	p2->p_ucred = crhold(p1->p_ucred);
 	td2->td_ucred = crhold(p2->p_ucred);	/* XXXKSE */
-#ifdef	DIAGNOSTIC 			/* see the comment in ast() */
-	td2->td_ucred_cache = NULL;
-#endif
 
 	if (p2->p_args)
 		p2->p_args->ar_ref++;
@@ -811,12 +808,9 @@ fork_exit(callout, arg, frame)
 		kthread_exit(0);
 	}
 	PROC_UNLOCK(p);
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
-	if (td->td_ucred_cache)
-		panic("fork_exit:thread already has cached ucred");
-	td->td_ucred_cache = td->td_ucred;
-       	td->td_ucred = NULL;
-#endif /* DIAGNOSTIC */
+#ifdef DIAGNOSTIC
+	cred_free_thread(td);
+#endif
 	mtx_assert(&Giant, MA_NOTOWNED);
 }