diff --git a/jetpack.php b/jetpack.php
index 2c9365ff3e..d9e99e81c6 100644
--- a/jetpack.php
+++ b/jetpack.php
@@ -124,6 +124,388 @@ function vip_jetpack_token_send_signature_error_headers( $error ) {
 
 add_action( 'jetpack_verify_signature_error', 'vip_jetpack_token_send_signature_error_headers' );
 
+// Default plan object for all VIP sites.
+define( 'VIP_JETPACK_DEFAULT_PLAN', array(
+	'product_id'         => 'vip',
+	'product_slug'       => 'vip',
+	'product_name_short' => 'VIP',
+	'product_variation'  => 'vip',
+	'supports'           => array(
+		'videopress',
+		'akismet',
+		'vaultpress',
+		'seo-tools',
+		'google-analytics',
+		'wordads',
+		'search',
+	),
+	'features'           => array(
+		'active'    => array(
+			'premium-themes',
+			'google-analytics',
+			'security-settings',
+			'advanced-seo',
+			'upload-video-files',
+			'video-hosting',
+			'send-a-message',
+			'whatsapp-button',
+			'social-previews',
+			'donations',
+			'core/audio',
+			'republicize',
+			'premium-content/container',
+			'akismet',
+			'vaultpress-backups',
+			'vaultpress-backup-archive',
+			'vaultpress-storage-space',
+			'vaultpress-automated-restores',
+			'vaultpress-security-scanning',
+			'polldaddy',
+			'simple-payments',
+			'support',
+			'wordads-jetpack',
+		),
+		'available' => array(
+			'security-settings'             => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'advanced-seo'                  => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'upload-video-files'            => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'akismet'                       => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'send-a-message'                => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'whatsapp-button'               => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'social-previews'               => array(
+				'jetpack_free',
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'google-analytics'              => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'video-hosting'                 => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'wordads-jetpack'               => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'vaultpress-backups'            => array(
+				'jetpack_premium',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'vaultpress-backup-archive'     => array(
+				'jetpack_premium',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'vaultpress-storage-space'      => array(
+				'jetpack_premium',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'vaultpress-automated-restores' => array(
+				'jetpack_premium',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'simple-payments'               => array(
+				'jetpack_premium',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_business_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+			),
+			'calendly'                      => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'opentable'                     => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'donations'                     => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'core/video'                    => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'core/cover'                    => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+			),
+			'core/audio'                    => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'republicize'                   => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'premium-content/container'     => array(
+				'jetpack_premium',
+				'jetpack_business',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'support'                       => array(
+				'jetpack_premium',
+				'jetpack_personal',
+				'jetpack_premium_monthly',
+				'jetpack_business_monthly',
+				'jetpack_personal_monthly',
+				'jetpack_security_daily',
+				'jetpack_security_daily_monthly',
+				'jetpack_security_realtime',
+				'jetpack_security_realtime_monthly',
+				'jetpack_complete_monthly',
+				'jetpack_security_t1_yearly',
+				'jetpack_security_t1_monthly',
+				'jetpack_security_t2_yearly',
+				'jetpack_security_t2_monthly',
+			),
+			'premium-themes'                => array(
+				'jetpack_business',
+				'jetpack_business_monthly',
+			),
+			'vaultpress-security-scanning'  => array(
+				'jetpack_business',
+				'jetpack_business_monthly',
+			),
+			'polldaddy'                     => array(
+				'jetpack_business',
+				'jetpack_business_monthly',
+			),
+		),
+	),
+) );
+
+/**
+ * Prevent the jetpack_active_plan from ever being overridden.
+ *
+ * All VIP sites should always have have a valid Jetpack plan.
+ *
+ * This will prevent issues from the plan option being corrupted,
+ * which can then break features like Jetpack Search.
+ */
+add_filter( 'pre_option_jetpack_active_plan', function ( $pre_option ) {
+	if ( true === WPCOM_IS_VIP_ENV && defined( 'VIP_JETPACK_DEFAULT_PLAN' ) ) {
+		return VIP_JETPACK_DEFAULT_PLAN;
+	}
+
+	return $pre_option;
+} );
+
+
 /**
  * Load the jetpack plugin according to several defines:
  * - If VIP_JETPACK_SKIP_LOAD is true, Jetpack will not be loaded
diff --git a/vip-jetpack/vip-jetpack.php b/vip-jetpack/vip-jetpack.php
index fb6b0c5bbb..27647c26a2 100644
--- a/vip-jetpack/vip-jetpack.php
+++ b/vip-jetpack/vip-jetpack.php
@@ -46,371 +46,6 @@
 	define( 'VIP_JETPACK_FULL_SYNC_IMMEDIATELY', true );
 }
 
-// Default plan object for all VIP sites.
-define( 'VIP_JETPACK_DEFAULT_PLAN', array(
-	'product_id'         => 'vip',
-	'product_slug'       => 'vip',
-	'product_name_short' => 'VIP',
-	'product_variation'  => 'vip',
-	'supports'           => array(
-		'videopress',
-		'akismet',
-		'vaultpress',
-		'seo-tools',
-		'google-analytics',
-		'wordads',
-		'search',
-	),
-	'features'           => array(
-		'active'    => array(
-			'premium-themes',
-			'google-analytics',
-			'security-settings',
-			'advanced-seo',
-			'upload-video-files',
-			'video-hosting',
-			'send-a-message',
-			'whatsapp-button',
-			'social-previews',
-			'donations',
-			'core/audio',
-			'republicize',
-			'premium-content/container',
-			'akismet',
-			'vaultpress-backups',
-			'vaultpress-backup-archive',
-			'vaultpress-storage-space',
-			'vaultpress-automated-restores',
-			'vaultpress-security-scanning',
-			'polldaddy',
-			'simple-payments',
-			'support',
-			'wordads-jetpack',
-		),
-		'available' => array(
-			'security-settings'             => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'advanced-seo'                  => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'upload-video-files'            => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'akismet'                       => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'send-a-message'                => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'whatsapp-button'               => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'social-previews'               => array(
-				'jetpack_free',
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'google-analytics'              => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'video-hosting'                 => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'wordads-jetpack'               => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'vaultpress-backups'            => array(
-				'jetpack_premium',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'vaultpress-backup-archive'     => array(
-				'jetpack_premium',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'vaultpress-storage-space'      => array(
-				'jetpack_premium',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'vaultpress-automated-restores' => array(
-				'jetpack_premium',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'simple-payments'               => array(
-				'jetpack_premium',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_business_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-			),
-			'calendly'                      => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'opentable'                     => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'donations'                     => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'core/video'                    => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'core/cover'                    => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-			),
-			'core/audio'                    => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'republicize'                   => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'premium-content/container'     => array(
-				'jetpack_premium',
-				'jetpack_business',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'support'                       => array(
-				'jetpack_premium',
-				'jetpack_personal',
-				'jetpack_premium_monthly',
-				'jetpack_business_monthly',
-				'jetpack_personal_monthly',
-				'jetpack_security_daily',
-				'jetpack_security_daily_monthly',
-				'jetpack_security_realtime',
-				'jetpack_security_realtime_monthly',
-				'jetpack_complete_monthly',
-				'jetpack_security_t1_yearly',
-				'jetpack_security_t1_monthly',
-				'jetpack_security_t2_yearly',
-				'jetpack_security_t2_monthly',
-			),
-			'premium-themes'                => array(
-				'jetpack_business',
-				'jetpack_business_monthly',
-			),
-			'vaultpress-security-scanning'  => array(
-				'jetpack_business',
-				'jetpack_business_monthly',
-			),
-			'polldaddy'                     => array(
-				'jetpack_business',
-				'jetpack_business_monthly',
-			),
-		),
-	),
-) );
-
 /**
  * Add the Connection Pilot. Ensures Jetpack is consistently connected.
  */
@@ -437,24 +72,6 @@
 	return $modules;
 }, 999 );
 
-/**
- * Prevent the jetpack_active_plan from ever being overridden.
- *
- * All sites on VIP Go should always have have a valid VIP plan.
- *
- * This will prevent issues from the plan option being corrupted,
- * which can then break features like Jetpack Search.
- */
-add_filter( 'pre_option_jetpack_active_plan', function ( $pre_option ) {
-	if ( true === WPCOM_IS_VIP_ENV
-		&& defined( 'VIP_JETPACK_DEFAULT_PLAN' )
-		&& Jetpack::is_active() ) {
-		return VIP_JETPACK_DEFAULT_PLAN;
-	}
-
-	return $pre_option;
-} );
-
 /**
  * Lock down the jetpack_sync_settings_max_queue_size to an allowed range
  *