diff --git a/wp-includes/template-functions-comment.php b/wp-includes/template-functions-comment.php
index 2b6d0a4f9..20a3ceb0d 100644
--- a/wp-includes/template-functions-comment.php
+++ b/wp-includes/template-functions-comment.php
@@ -171,14 +171,15 @@ function comment_author_link() {
 
 function comment_type($commenttxt = 'Comment', $trackbacktxt = 'Trackback', $pingbacktxt = 'Pingback') {
 	global $comment;
-	if (preg_match('|<trackback />|', $comment->comment_content)
-		|| ('trackback' == $comment->comment_type)) {
-		echo $trackbacktxt;
-	} elseif (preg_match('|<pingback />|', $comment->comment_content)
-		|| ('pingback' == $comment->comment_type)) {
-		echo $pingbacktxt;
-	} else {
-		echo $commenttxt;
+	switch($comment->comment_type) {
+		case 'trackback':
+			echo $trackbacktxt;
+			break;
+		case 'pingback':
+			echo $pingbacktxt;
+			break;
+		default:
+			echo $commenttxt;
 	}
 }