diff --git wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php
index cff90f2ae..e0eae8483 100644
--- wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php
+++ wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php
@@ -42,14 +42,20 @@ class Code_Import extends I18n_Import {
 			throw new Exception( 'Plugin is not compatible with language packs: ' . $valid->get_error_message() );
 		}
 
-		if ( ! class_exists( '\PotExtMeta' ) ) {
-			require_once plugin_dir_path( \WordPressdotorg\Plugin_Directory\PLUGIN_FILE ) . 'libs/i18n-tools/makepot.php';
-		}
-
 		$pot_file = "{$tmp_directory}/{$this->plugin}-code.pot";
-		$makepot  = new \MakePOT();
 
-		if ( ! $makepot->wp_plugin( $export_directory, $pot_file, $this->plugin ) || ! file_exists( $pot_file ) ) {
+		exec(
+			sprintf(
+				'wp i18n make-pot %s %s --slug=%s --ignore-domain',
+				escapeshellarg( $export_directory ),
+				escapeshellarg( $pot_file ),
+				escapeshellarg( $this->plugin )
+			),
+			$output,
+			$return_code
+		);
+
+		if ( $return_code !== 0 || ! file_exists( $pot_file ) ) {
 			throw new Exception( "POT file couldn't be created." );
 		}
 
diff --git wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php
index 9feea2711..949410589 100644
--- wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php
+++ wordpress.org/public_html/wp-content/plugins/wporg-gp-theme-directory/inc/cli/class-set-theme-project.php
@@ -3,7 +3,6 @@
 namespace WordPressdotorg\GlotPress\Theme_Directory\CLI;
 
 use GP;
-use MakePOT;
 use WordPressdotorg\GlotPress\Theme_Directory\Plugin;
 use WP_CLI;
 use WP_CLI_Command;
@@ -24,13 +23,6 @@ class Set_Theme_Project extends WP_CLI_Command {
 	 */
 	private $temp_dir;
 
-	/**
-	 * MakePot instance.
-	 *
-	 * @var MakePot
-	 */
-	private $makepot;
-
 	public function __construct() {
 		if ( ! file_exists( '/tmp/wporg-themes-i18n/' ) ) {
 			mkdir( '/tmp/wporg-themes-i18n/' );
@@ -41,13 +33,6 @@ class Set_Theme_Project extends WP_CLI_Command {
 		if ( ! mkdir( $this->temp_dir ) ) {
 			WP_CLI::error( "Couldn't create temporary directory." );
 		}
-
-		$this->checkout_tools();
-		if ( ! file_exists( $this->temp_dir . '/i18n-tools/makepot.php' ) ) {
-			WP_CLI::error( "Couldn't find MakePot." );
-		}
-		require_once $this->temp_dir . '/i18n-tools/makepot.php';
-		$this->makepot = new MakePot();
 	}
 
 	/**
@@ -157,7 +142,13 @@ class Set_Theme_Project extends WP_CLI_Command {
 	 */
 	private function generate_pot( $theme_slug, $theme_dir ) {
 		$pot_file = "{$this->temp_dir}/{$theme_slug}.pot";
-		$this->makepot->wp_theme( $theme_dir, $pot_file );
+		WP_CLI::runcommand(
+			sprintf(
+				'wp i18n make-pot %s %s --ignore-domain',
+				escapeshellarg( $theme_dir ),
+				escapeshellarg( $pot_file )
+			)
+		);
 		return $pot_file;
 	}
 
@@ -304,17 +295,6 @@ class Set_Theme_Project extends WP_CLI_Command {
 		return $data;
 	}
 
-	/**
-	 * Creates an i18n-tools checkout so we have MakePot available.
-	 */
-	private function checkout_tools() {
-		$tools_dir = "{$this->temp_dir}/i18n-tools/";
-		if ( ! file_exists( $tools_dir ) ) {
-			$esc_tools_dir = escapeshellarg( $tools_dir );
-			`svn export --non-interactive https://i18n.svn.wordpress.org/tools/trunk {$esc_tools_dir}`;
-		}
-	}
-
 	/**
 	 * Cleanup a theme directory, for when this is used in batch mode.
 	 */