Index: wp-content/themes/twentythirteen/functions.php
===================================================================
--- wp-content/themes/twentythirteen/functions.php	(revision 24022)
+++ wp-content/themes/twentythirteen/functions.php	(working copy)
@@ -67,18 +67,18 @@
 	add_theme_support( 'automatic-feed-links' );
 
 	/*
-	 * This theme supports all available post formats.
-	 * See http://codex.wordpress.org/Post_Formats
+	 * This theme supports all available post formats by default.
+	 * See http://codex.wordpress.org/Post_Formats	
+	 * For most formats we don't need to explicitly state support, including
+	 * Aside, Audio, Chat, Gallery, Image, Quote, Status, and Video
 	 *
-	 * Structured post formats are formats where Twenty Thirteen handles the
-	 * output instead of the default core HTML output.
+	 * Structured post formats, however, are formats where the theme handles
+	 * the output instead of the default core HTML output. This means only
+	 * Link, in the case of Twenty Thirteen.
 	 */
 	add_theme_support( 'structured-post-formats', array(
-		'link', 'video'
+		'link'
 	) );
-	add_theme_support( 'post-formats', array(
-		'aside', 'audio', 'chat', 'gallery', 'image', 'quote', 'status'
-	) );
 
 	/*
 	 * Custom callback to make it easier for our fixed navbar to coexist with