Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php	(revision 3297)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php	(working copy)
@@ -42,7 +42,7 @@
 				if ( is_singular( 'post' ) ) {
 					wp_list_comments();
 				} else {
-					wp_list_comments( array( 'callback' => 'wporg_developer_user_note' ) );
+					wporg_developer_list_user_notes();
 				}
 			?>
 		</ol><!-- .comment-list -->
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php	(revision 3297)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php	(working copy)
@@ -72,13 +72,45 @@
 		}
 	endif;
 
+	if ( ! function_exists( 'wporg_developer_list_user_notes' ) ) :
+		/**
+		 * List user contibuted notes
+		 *
+		 * @param integer $post_id Optional. Post id to list comments for
+		 */
+		function wporg_developer_list_user_notes( $post_id = 0 ) {
+
+			$post_id = absint( $post_id );
+
+			if ( ! $post_id ) {
+				$post_id = get_the_ID();
+			}
+
+			$comments = get_comments ( array( 'post__in' => array( $post_id ) ) );
+			$order    = array();
+
+			if ( empty( $comments ) ) {
+				return;
+			}
+
+			foreach ( $comments as $key => $comment ) {
+				$order[ $key ] = (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' );
+			}
+
+			// sort the posts by votes
+			array_multisort( $order, SORT_DESC, $comments );
+
+			foreach  ( $comments as $key => $comment ) {
+				wporg_developer_user_note( $comment );
+			}
+		}
+	endif;
+
 	if ( ! function_exists( 'wporg_developer_user_note' ) ) :
 		/**
 		 * Template for user contributed notes.
-		 *
-		 * Used as a callback by wp_list_comments() for displaying the notes.
 		 */
-		function wporg_developer_user_note( $comment, $args, $depth ) {
+		function wporg_developer_user_note( $comment ) {
 			$GLOBALS['comment'] = $comment;
 
 			if ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) : ?>
@@ -90,7 +122,7 @@
 
 			<?php else : ?>
 
-				<li id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
+				<li id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
 				<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 					<div class="comment-content">
 						<?php comment_text(); ?>
@@ -101,9 +133,7 @@
 						<?php DevHub_User_Contributed_Notes_Voting::show_voting(); ?>
 						<div class="comment-author vcard">
 							<span class="comment-author-attribution">
-							<?php if ( 0 != $args['avatar_size'] ) {
-								echo get_avatar( $comment, $args['avatar_size'] );
-							} ?>
+							<?php echo get_avatar( $comment, 32 ); ?>
 
 							<?php
 								// This would all be moot if core passed the $comment context for 'get_comment_author_link' filter
@@ -135,15 +165,6 @@
 					</footer>
 					<!-- .comment-meta -->
 
-					<?php
-					comment_reply_link( array_merge( $args, array(
-						'add_below' => 'div-comment',
-						'depth'     => $depth,
-						'max_depth' => $args['max_depth'],
-						'before'    => '<div class="reply">',
-						'after'     => '</div>',
-					) ) );
-					?>
 				</article><!-- .comment-body -->
 
 			<?php