diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 5f9202c32..041628311 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -365,7 +365,7 @@ function upgrade_210() {
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
 		if ( !empty($posts) )
 			foreach ( $posts as $post )
-				wp_schedule_event(mysql2date('U', $post->post_date), 'once', 'publish_future_post', $post->ID);
+				wp_schedule_single_event(mysql2date('U', $post->post_date), 'publish_future_post', $post->ID);
 	}
 	if ( $wp_current_db_version < 3570 ) {
 		// Create categories for link categories if a category with the same
diff --git a/wp-includes/cron.php b/wp-includes/cron.php
index 3a7301a9f..ca44bed2e 100644
--- a/wp-includes/cron.php
+++ b/wp-includes/cron.php
@@ -6,7 +6,7 @@ function wp_schedule_single_event($timestamp, $hook) {
 	ksort($crons);
 	update_option('cron', $crons);
 }
-function wp_schedule_new_event($timestamp, $recurrence, $hook) {
+function wp_schedule_event($timestamp, $recurrence, $hook) {
 	$args = array_slice(func_get_args(), 3);
 	$crons = get_option('cron');
 	$schedules = wp_get_schedules();
@@ -37,7 +37,7 @@ function wp_reschedule_event($timestamp, $recurrence, $hook) {
 	while($timestamp < time() + 1) {
 		$timestamp += $interval;
 	}
-	wp_schedule_new_event($timestamp, $recurrence, $hook);
+	wp_schedule_event($timestamp, $recurrence, $hook);
 }
 
 function wp_unschedule_event($timestamp, $hook) {
@@ -66,12 +66,6 @@ function wp_next_scheduled($hook) {
 
 function spawn_cron() {
 	if (array_shift(array_keys(get_option('cron'))) > time()) return;
-
-	//Since execute pings had CGI problems, but I'd like to test this without this code first
-	// It seems to be working on CGI here, please report if you have issues
-/*	if ( substr(php_sapi_name(), 0, 3) == 'cgi' ) {
-		echo '<iframe src="' . $cron_url . '"></iframe>';
-	}*/
 	
 	$cron_url = get_settings('siteurl') . '/wp-cron.php';
 	$parts = parse_url($cron_url);
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 3d398c085..d2054ac48 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -86,5 +86,6 @@ add_filter('option_ping_sites', 'privacy_ping_filter');
 add_action('wp_head', 'rsd_link');
 add_action('publish_future_post', 'wp_publish_post', 10, 1);
 add_action('wp_head', 'noindex', 1);
-add_action('init', 'wp_cron');
+if(!defined('DOING_CRON'))
+	add_action('init', 'wp_cron');
 ?>