Index: wp-content/themes/twentythirteen/style.css
===================================================================
--- wp-content/themes/twentythirteen/style.css	(revision 24153)
+++ wp-content/themes/twentythirteen/style.css	(working copy)
@@ -502,7 +502,7 @@
 
 /* Clearing floats */
 .clear:after,
-.format-audio .entry-media:after,
+.entry-media:after,
 .attachment .entry-header:after,
 .site-footer .widget-area:after,
 .entry-content:after,
@@ -516,8 +516,8 @@
 
 .clear:before,
 .clear:after,
-.format-audio .entry-media:before,
-.format-audio .entry-media:after,
+.entry-media:before,
+.entry-media:after,
 .attachment .entry-header:before,
 .attachment .entry-header:after,
 .site-footer .widget-area:before,
@@ -679,6 +679,7 @@
 	height: auto;
 }
 
+.entry-media img,
 img.size-full,
 img.size-large,
 img.wp-post-image {
@@ -1422,10 +1423,10 @@
 	padding: 0 316px 0 0;
 }
 
-.entry-media > *, .entry-media > * > img {
-	display: block;
+.entry-media .wp-caption,
+.entry-media .wp-caption-text,
+.entry-media [class*="align"] {
 	margin: 0 auto;
-	max-width: 100%;
 }
 
 /* Aside */
@@ -2755,13 +2756,7 @@
 		margin-right: 0;
 	}
 
-	.sidebar .format-image .entry-content .size-full {
-		margin: 0;
-	}
-
-	.error404 .page-header,
-	.sidebar .format-image .entry-content img.size-full,
-	.sidebar .format-image .wp-caption:first-child .wp-caption-text {
+	.error404 .page-header {
 		margin-left: auto;
 		max-width: 604px;
 		width: 100%;
@@ -2819,8 +2814,7 @@
 	.sidebar .post-navigation .nav-links,
 	.author.sidebar .author-info,
 	.format-audio .entry-media,
-	.sidebar .format-audio .entry-media,
-	.sidebar .format-image .entry-content {
+	.sidebar .format-audio .entry-media {
 		max-width: 604px;
 		padding-left: 0;
 		padding-right: 0;
@@ -2923,13 +2917,6 @@
 		margin-right: 0;
 	}
 
-	.format-image .entry-content img:first-of-type,
-	.format-image .wp-caption:first-child .wp-caption-text {
-		margin-left: auto;
-		max-width: 604px;
-		width: 100%;
-	}
-
 	.entry-media,
 	.sidebar .entry-media {
 		max-width: 604px;
Index: wp-content/themes/twentythirteen/rtl.css
===================================================================
--- wp-content/themes/twentythirteen/rtl.css	(revision 24153)
+++ wp-content/themes/twentythirteen/rtl.css	(working copy)
@@ -323,6 +323,11 @@
  * ----------------------------------------------------------------------------
  */
 
+.entry-media a,
+.entry-content a {
+	display: inline;
+}
+
 .format-aside cite:before {
 	content: normal;
 	margin-right: auto;