diff --git a/tasks/makepot/node_modules/grunt-wp-i18n/vendor/wp-i18n-tools/extract.php b/tasks/makepot/node_modules/grunt-wp-i18n/vendor/wp-i18n-tools/extract.php
index 21b1b1ffe2..1fc84dc014 100644
--- a/tasks/makepot/node_modules/grunt-wp-i18n/vendor/wp-i18n-tools/extract.php
+++ b/tasks/makepot/node_modules/grunt-wp-i18n/vendor/wp-i18n-tools/extract.php
@@ -287,7 +287,8 @@ class StringExtractor {
 
         $arguments = array();
         foreach($arguments_matches[0] as $argument) {
-          $arguments[] = trim($argument, "'\"");
+          // Remove surrounding quotes of the same type from argument strings
+          $arguments[] = preg_replace("/^(('|\")+)(.*)\\1$/", "\\3", $argument);
         }
 
         $call = array(