Index: edit-form-advanced.php
===================================================================
--- edit-form-advanced.php	(revision 23885)
+++ edit-form-advanced.php	(working copy)
@@ -128,7 +128,7 @@
 
 // post format
 $format_class = '';
-if ( post_type_supports( $post_type, 'post-formats' ) ) {
+if ( post_type_supports( $post_type, 'post-formats' ) and apply_filters( 'show_post_format_ui', true, $post_type ) ) {
 	wp_enqueue_script( 'post-formats' );
 	wp_enqueue_script( 'wp-mediaelement' );
 	wp_enqueue_style( 'wp-mediaelement' );
@@ -439,7 +439,7 @@
 }
 
 // post format fields
-if ( post_type_supports( $post_type, 'post-formats' ) )
+if ( post_type_supports( $post_type, 'post-formats' ) and apply_filters( 'show_post_format_ui', true, $post_type ) )
 	require_once( './includes/post-formats.php' );
 
 if ( post_type_supports($post_type, 'editor') ) {