diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 9098d2fb5..50b7d8b08 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -191,16 +191,11 @@ function edit_post( $post_data = null ) {
 	}
 
 	// Post Formats
-	if ( current_theme_supports( 'post-formats' ) && isset( $post_data['post_format'] ) ) {
-		$formats = get_theme_support( 'post-formats' );
-		if ( is_array( $formats ) ) {
-			$formats = $formats[0];
-			if ( in_array( $post_data['post_format'], $formats ) ) {
-				set_post_format( $post_ID, $post_data['post_format'] );
-			} elseif ( '0' == $post_data['post_format'] ) {
-				set_post_format( $post_ID, false );
-			}
-		}
+	if ( isset( $post_data['post_format'] ) ) {
+		if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) )
+			set_post_format( $post_ID, $post_data['post_format'] );
+		elseif ( '0' == $post_data['post_format'] )
+			set_post_format( $post_ID, false );
 	}
 
 	// Meta Stuff
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index fb056a6b3..43dd6c36c 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -63,15 +63,11 @@ function press_it() {
 		wp_die($upload);
 	} else {
 		// Post formats
-		if ( current_theme_supports( 'post-formats' ) && isset( $_POST['post_format'] ) ) {
-			$post_formats = get_theme_support( 'post-formats' );
-			if ( is_array( $post_formats ) ) {
-				$post_formats = $post_formats[0];
-				if ( in_array( $_POST['post_format'], $post_formats ) )
-					set_post_format( $post_ID, $_POST['post_format'] );
-				elseif ( '0' == $_POST['post_format'] )
-					set_post_format( $post_ID, false );
-			}
+		if ( isset( $_POST['post_format'] ) ) {
+			if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) )
+				set_post_format( $post_ID, $_POST['post_format'] );
+			elseif ( '0' == $post_data['post_format'] )
+				set_post_format( $post_ID, false );
 		}
 
 		wp_update_post($post);