diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
index f9c6be2668a..7379ba2d6ae 100644
--- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
+++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java
@@ -42,7 +42,7 @@ public class ProtoConfiguration extends Fragment implements ProtoConfigurationAp
   public static class Options extends FragmentOptions {
     @Option(
         name = "incompatible_generated_protos_in_virtual_imports",
-        defaultValue = "true",
+        defaultValue = "false",
         documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
         effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
         metadataTags = {
diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java b/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
index e2395672120..7b26d789b73 100644
--- a/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
+++ b/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryTest.java
@@ -370,16 +370,13 @@ public void testExternalRepoWithGeneratedProto() throws Exception {
         TestConstants.LOAD_PROTO_LIBRARY,
         "proto_library(name='a', srcs=['a.proto'], deps=['@foo//x:x'])");
 
-    String genfiles = getTargetConfiguration().getGenfilesFragment().toString();
     ConfiguredTarget a = getConfiguredTarget("//a:a");
     ProtoInfo aInfo = a.get(ProtoInfo.PROVIDER);
-    assertThat(aInfo.getTransitiveProtoSourceRoots())
-        .containsExactly(".", genfiles + "/external/foo/x/_virtual_imports/x");
+    assertThat(aInfo.getTransitiveProtoSourceRoots()).containsExactly(".", "external/foo");
 
     ConfiguredTarget x = getConfiguredTarget("@foo//x:x");
     ProtoInfo xInfo = x.get(ProtoInfo.PROVIDER);
-    assertThat(xInfo.getTransitiveProtoSourceRoots())
-        .containsExactly(genfiles + "/external/foo/x/_virtual_imports/x");
+    assertThat(xInfo.getTransitiveProtoSourceRoots()).containsExactly("external/foo");
   }
 
   @Test