diff --git a/commands/Pressable_Site_Clone.php b/commands/Pressable_Site_Clone.php
index 920dcb6..0dbcf12 100644
--- a/commands/Pressable_Site_Clone.php
+++ b/commands/Pressable_Site_Clone.php
@@ -243,7 +243,7 @@ function ( $stream ) use ( &$safety_net_installed, $output ) {
 			);
 
 			if ( ! $safety_net_installed ) {
-				run_pressable_site_wp_cli_command( $site_clone->id, 'plugin install https://github.com/a8cteam51/safety-net/releases/latest/download/safety-net.zip' );
+				run_pressable_site_wp_cli_command( $site_clone->id, 'plugin install https://github.com/a8cteam51/safety-net/releases/latest/download/safety-net.zip --skip-plugins --skip-themes' );
 				$ssh_connection->exec( 'mv -f htdocs/wp-content/plugins/safety-net htdocs/wp-content/mu-plugins/safety-net' );
 				$ssh_connection->exec(
 					'ls htdocs/wp-content/mu-plugins',
@@ -280,8 +280,6 @@ function ( $stream ) use ( $site_clone, $output ) {
 			);
 		}
 
-		// Done last because it seems to cause issues sometimes with the connection breaking off.
-		run_pressable_site_wp_cli_command( $site_clone->id, "search-replace {$this->site->url} $site_clone->url" );
 		run_pressable_site_wp_cli_command( $site_clone->id, 'cache flush' );
 
 		return Command::SUCCESS;
diff --git a/commands/WPCOM_Site_Clone.php b/commands/WPCOM_Site_Clone.php
index a75d97c..c0aaacd 100644
--- a/commands/WPCOM_Site_Clone.php
+++ b/commands/WPCOM_Site_Clone.php
@@ -180,7 +180,6 @@ protected function execute( InputInterface $input, OutputInterface $output ): in
 		);
 
 		run_wpcom_site_wp_cli_command( $staging_site->id, 'config set WP_ENVIRONMENT_TYPE development --type=constant' );
-		run_wpcom_site_wp_cli_command( $staging_site->id, "search-replace {$this->site->URL} $staging_site_https_url" );
 		run_wpcom_site_wp_cli_command( $staging_site->id, 'cache flush' );
 
 		if ( $this->skip_safety_net ) {
@@ -201,7 +200,7 @@ function ( $stream ) use ( &$safety_net_installed, $output ) {
 			);
 
 			if ( ! $safety_net_installed ) {
-				run_wpcom_site_wp_cli_command( $transfer->blog_id, 'plugin install https://github.com/a8cteam51/safety-net/releases/latest/download/safety-net.zip' );
+				run_wpcom_site_wp_cli_command( $transfer->blog_id, 'plugin install https://github.com/a8cteam51/safety-net/releases/latest/download/safety-net.zip --skip-plugins --skip-themes' );
 				$ssh_connection->exec( 'mv -f htdocs/wp-content/plugins/safety-net htdocs/wp-content/mu-plugins/safety-net' );
 				$ssh_connection->exec(
 					'ls htdocs/wp-content/mu-plugins',