diff --git a/codeql-extractor.yml b/codeql-extractor.yml
index e4da61ac7af..b258b193f56 100644
--- a/codeql-extractor.yml
+++ b/codeql-extractor.yml
@@ -6,8 +6,6 @@ pull_request_triggers:
   - "**/glide.yaml"
   - "**/Gopkg.toml"
 column_kind: "utf8"
-extra_env_vars:
-  CODEQL_REDUCE_FILES_FOLDERS_RELATIONS: "true"
 file_types:
   - name: go
     display_name: Go
diff --git a/codeql-tools/pre-finalize.cmd b/codeql-tools/pre-finalize.cmd
index f8909ea54ef..4abac249933 100644
--- a/codeql-tools/pre-finalize.cmd
+++ b/codeql-tools/pre-finalize.cmd
@@ -1,8 +1,6 @@
 @echo off
 SETLOCAL EnableDelayedExpansion
 
-SET CODEQL_REDUCE_FILES_FOLDERS_RELATIONS=true
-
 if NOT "%CODEQL_EXTRACTOR_GO_EXTRACT_HTML%"=="no" (
   type NUL && "%CODEQL_DIST%/codeql.exe" database index-files ^
                         --working-dir=. ^
diff --git a/codeql-tools/pre-finalize.sh b/codeql-tools/pre-finalize.sh
index 6151f552698..3a8b31c70a0 100755
--- a/codeql-tools/pre-finalize.sh
+++ b/codeql-tools/pre-finalize.sh
@@ -3,7 +3,7 @@
 set -eu
 
 if [ "${CODEQL_EXTRACTOR_GO_EXTRACT_HTML:-yes}" != "no" ]; then
-  CODEQL_REDUCE_FILES_FOLDERS_RELATIONS=true "$CODEQL_DIST/codeql" database index-files \
+  "$CODEQL_DIST/codeql" database index-files \
                         --working-dir=. \
                         --include-extension=.htm \
                         --include-extension=.html \