diff --git a/winsup/cygwin/msys2_path_conv.cc b/winsup/cygwin/msys2_path_conv.cc
index 7dbef1a44b..133939a7a8 100644
--- a/winsup/cygwin/msys2_path_conv.cc
+++ b/winsup/cygwin/msys2_path_conv.cc
@@ -348,6 +348,14 @@ path_type find_path_start_and_type(const char** src, int recurse, const char* en
         return NONE;
     }
 
+    /*
+     * Skip path mangling when environment indicates it.
+     */
+    const char *no_pathconv = getenv ("MSYS_NO_PATHCONV");
+
+    if (no_pathconv)
+      goto skip_p2w;
+
     /*
      * Prevent Git's :file.txt and :/message syntax from beeing modified.
      */