Index: wp-includes/default-filters.php
===================================================================
--- wp-includes/default-filters.php	(revision 17114)
+++ wp-includes/default-filters.php	(working copy)
@@ -187,9 +187,6 @@
 add_filter( 'editable_slug',        'urldecode'                           );
 add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'    );
 
-// Atom SSL support
-add_filter( 'atom_service_url','atom_service_url_filter' );
-
 // Actions
 add_action( 'wp_head',             'wp_enqueue_scripts',            1     );
 add_action( 'wp_head',             'feed_links',                    2     );
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 17114)
+++ wp-includes/functions.php	(working copy)
@@ -3242,22 +3242,6 @@
 }
 
 /**
- * Secure URL, if available or the given URL.
- *
- * @since 2.5.0
- *
- * @param string $url Complete URL path with transport.
- * @return string Secure or regular URL path.
- */
-function atom_service_url_filter($url)
-{
-	if ( url_is_accessable_via_ssl($url) )
-		return preg_replace( '/^http:\/\//', 'https://',  $url );
-	else
-		return $url;
-}
-
-/**
  * Marks a function as deprecated and informs when it has been used.
  *
  * There is a hook deprecated_function_run that will be called that can be used
Index: xmlrpc.php
===================================================================
--- xmlrpc.php	(revision 17114)
+++ xmlrpc.php	(working copy)
@@ -42,7 +42,7 @@
       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
-      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', site_url('wp-app.php/service', 'rpc') ) ?>" />
+      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo site_url('wp-app.php/service', 'rpc') ?>" />
     </apis>
   </service>
 </rsd>