diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 41794e0246..e3e5e3fd0c 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -37,19 +37,20 @@ class WP_oEmbed {
 		// The WP_Embed class disables discovery for non-unfiltered_html users, so only providers in this array will be used for them.
 		// Add to this list using the wp_oembed_add_provider() function (see it's PHPDoc for details).
 		$this->providers = apply_filters( 'oembed_providers', array(
-			'#http://(www\.)?youtube.com/watch.*#i' => array( 'http://www.youtube.com/oembed',            true  ),
-			'http://blip.tv/file/*'                 => array( 'http://blip.tv/oembed/',                   false ),
-			'#http://(www\.)?vimeo\.com/.*#i'       => array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
-			'#http://(www\.)?dailymotion\.com/.*#i' => array( 'http://www.dailymotion.com/api/oembed',    true  ),
-			'#http://(www\.)?flickr\.com/.*#i'      => array( 'http://www.flickr.com/services/oembed/',   true  ),
-			'#http://(www\.)?hulu\.com/watch/.*#i'  => array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
-			'#http://(www\.)?viddler\.com/.*#i'     => array( 'http://lab.viddler.com/services/oembed/',  true  ),
-			'http://qik.com/*'                      => array( 'http://qik.com/api/oembed.{format}',       false ),
-			'http://revision3.com/*'                => array( 'http://revision3.com/api/oembed/',         false ),
-			'http://i*.photobucket.com/albums/*'    => array( 'http://photobucket.com/oembed',            false ),
-			'http://gi*.photobucket.com/groups/*'   => array( 'http://photobucket.com/oembed',            false ),
-			'#http://(www\.)?scribd\.com/.*#i'      => array( 'http://www.scribd.com/services/oembed',    true  ),
-			'http://wordpress.tv/*'                 => array( 'http://wordpress.tv/oembed/',              false ),
+			'#http://(www\.)?youtube.com/watch.*#i'         => array( 'http://www.youtube.com/oembed',            true  ),
+			'http://blip.tv/file/*'                         => array( 'http://blip.tv/oembed/',                   false ),
+			'#http://(www\.)?vimeo\.com/.*#i'               => array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
+			'#http://(www\.)?dailymotion\.com/.*#i'         => array( 'http://www.dailymotion.com/api/oembed',    true  ),
+			'#http://(www\.)?flickr\.com/.*#i'              => array( 'http://www.flickr.com/services/oembed/',   true  ),
+			'#http://(www\.)?hulu\.com/watch/.*#i'          => array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
+			'#http://(www\.)?viddler\.com/.*#i'             => array( 'http://lab.viddler.com/services/oembed/',  true  ),
+			'http://qik.com/*'                              => array( 'http://qik.com/api/oembed.{format}',       false ),
+			'http://revision3.com/*'                        => array( 'http://revision3.com/api/oembed/',         false ),
+			'http://i*.photobucket.com/albums/*'            => array( 'http://photobucket.com/oembed',            false ),
+			'http://gi*.photobucket.com/groups/*'           => array( 'http://photobucket.com/oembed',            false ),
+			'#http://(www\.)?scribd\.com/.*#i'              => array( 'http://www.scribd.com/services/oembed',    true  ),
+			'http://wordpress.tv/*'                         => array( 'http://wordpress.tv/oembed/',              false ),
+			'#http://(answers|surveys)\.polldaddy.com/.*#i' => array( 'http://polldaddy.com/oembed/',             true ),
 		) );
 
 		// Fix Scribd embeds. They contain new lines in the middle of the HTML which breaks wpautop().
diff --git a/wp-includes/default-embeds.php b/wp-includes/default-embeds.php
index d0a2336d2c..1283c1e2ec 100644
--- a/wp-includes/default-embeds.php
+++ b/wp-includes/default-embeds.php
@@ -32,21 +32,4 @@ function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
 }
 wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
 
-/**
- * The PollDaddy.com embed handler callback. PollDaddy does not support oEmbed, at least not yet.
- *
- * @see WP_Embed::register_handler()
- * @see WP_Embed::shortcode()
- *
- * @param array $matches The regex matches from the provided regex when calling {@link wp_embed_register_handler()}.
- * @param array $attr Embed attributes.
- * @param string $url The original URL that was matched by the regex.
- * @param array $rawattr The original unmodified attributes.
- * @return string The embed HTML.
- */
-function wp_embed_handler_polldaddy( $matches, $attr, $url, $rawattr ) {
-	return apply_filters( 'embed_polldaddy', '<script type="text/javascript" charset="utf8" src="http://s3.polldaddy.com/p/' . esc_attr($matches[1]) . '"></script>', $matches, $attr, $url, $rawattr );
-}
-wp_embed_register_handler( 'polldaddy', '#http://answers.polldaddy.com/poll/(\d+)(.*?)#i', 'wp_embed_handler_polldaddy' );
-
 ?>
\ No newline at end of file