diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 0c4a9c9a6d..e7d37f4c75 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -313,7 +313,6 @@ function populate_options() {
 
 	// 2.9
 	'embed_autourls' => 1,
-	'embed_oembed_discover' => 1,
 	'embed_size_w' => '',
 	'embed_size_h' => 600,
 	);
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 8d6238f487..abe72bc5e1 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -76,15 +76,6 @@ include('admin-header.php');
 </fieldset></td>
 </tr>
 
-<?php if ( current_user_can('unfiltered_html') ) { ?>
-<tr valign="top">
-<th scope="row"><?php _e('oEmbed discovery'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php printf( __('Attempt to embed content from unknown URLs using <a href="%s">oEmbed</a>'), 'http://codex.wordpress.org/Embeds#oEmbed' ); ?></span></legend>
-<label for="embed_oembed_discover"><input name="embed_oembed_discover" type="checkbox" id="embed_oembed_discover" value="1" <?php checked( '1', get_option('embed_oembed_discover') ); ?>/> <?php printf( __('Attempt to embed content from unknown URLs using <a href="%s">oEmbed</a>'), 'http://codex.wordpress.org/Embeds#oEmbed' ); ?></label>
-</fieldset></td>
-</tr>
-
-<?php } ?>
 <tr valign="top">
 <th scope="row"><?php _e('Maximum embed size') ?></th>
 <td>
diff --git a/wp-admin/options.php b/wp-admin/options.php
index bcf3cc4a88..a1bb4a0ff3 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -25,7 +25,7 @@ $whitelist_options = array(
 	'general' => array( 'blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'default_role', 'timezone_string' ),
 	'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
 	'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
-	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_oembed_discover', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
+	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
 	'privacy' => array( 'blog_public' ),
 	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
 	'writing' => array( 'default_post_edit_rows', 'use_smilies', 'ping_sites', 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
diff --git a/wp-includes/media.php b/wp-includes/media.php
index f93317707f..8f0bf3aaa1 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1099,7 +1099,7 @@ class WP_Embed {
 			}
 
 			// Use oEmbed to get the HTML
-			$attr['discover'] = ( get_option( 'embed_oembed_discover' ) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
+			$attr['discover'] = ( apply_filters('embed_oembed_discover', false) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
 			$html = wp_oembed_get( $url, $attr );
 
 			// Cache the result