4 files changed, 12 insertions, 16 deletions
diff --git a/plugins/jetpack/3rd-party/3rd-party.php b/plugins/jetpack/3rd-party/3rd-party.php
index 2bab75b8..117f573b 100644
--- a/plugins/jetpack/3rd-party/3rd-party.php
+++ b/plugins/jetpack/3rd-party/3rd-party.php
@@ -10,4 +10,6 @@ require_once( JETPACK__PLUGIN_DIR . '3rd-party/wpml.php' );
 require_once( JETPACK__PLUGIN_DIR . '3rd-party/bitly.php' );
 require_once( JETPACK__PLUGIN_DIR . '3rd-party/bbpress.php' );
 require_once( JETPACK__PLUGIN_DIR . '3rd-party/woocommerce.php' );
-require_once( JETPACK__PLUGIN_DIR . '3rd-party/vaultpress.php' );
+
+// We can't load this conditionally since polldaddy add the call in class constuctor.
+require_once( JETPACK__PLUGIN_DIR . '3rd-party/polldaddy.php' );
diff --git a/plugins/jetpack/3rd-party/bitly.php b/plugins/jetpack/3rd-party/bitly.php
index eeca3b7f..d9b744a5 100644
--- a/plugins/jetpack/3rd-party/bitly.php
+++ b/plugins/jetpack/3rd-party/bitly.php
@@ -2,7 +2,7 @@
 
 /*
  * Fixes issues with the Official Bitly for WordPress
- * http://wordpress.org/plugins/bitly/
+ * https://wordpress.org/plugins/bitly/
  */
 if( class_exists( 'Bitly' ) ) {
 
@@ -10,7 +10,7 @@ if( class_exists( 'Bitly' ) ) {
 		if ( method_exists( $GLOBALS['bitly'], 'og_tags' ) ) {
 			remove_action( 'wp_head', array( $GLOBALS['bitly'], 'og_tags' ) );
 		}
-		
+
 		add_action( 'wp_head', 'jetpack_bitly_og_tag', 100 );
 	}
 
diff --git a/plugins/jetpack/3rd-party/polldaddy.php b/plugins/jetpack/3rd-party/polldaddy.php
new file mode 100644
index 00000000..ec484829
--- /dev/null
+++ b/plugins/jetpack/3rd-party/polldaddy.php
@@ -0,0 +1,7 @@
+<?php
+
+class Jetpack_Sync {
+	static function sync_options() {
+		_deprecated_function( __METHOD__, 'jetpack-4.2', 'jetpack_options_whitelist filter' );
+	}
+}
diff --git a/plugins/jetpack/3rd-party/vaultpress.php b/plugins/jetpack/3rd-party/vaultpress.php
deleted file mode 100644
index d2c1374c..00000000
--- a/plugins/jetpack/3rd-party/vaultpress.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * For backward compatibility with VaultPress 1.8.3 to play nicely with Jetpack 4.1
- */
-add_action( 'init', 'jetpack_vaultpress_sync_options' );
-function jetpack_vaultpress_sync_options() {
-	if ( ! class_exists( 'VaultPress' ) ) {
-		return;
-	}
-	$vaultpress = VaultPress::init();
-	Jetpack_Sync::sync_options( __FILE__, $vaultpress->auto_register_option, $vaultpress->option_name );
-}