diff --git a/.golangci.yml b/.golangci.yml
index e7fcf402f64384846c91e23b4072e9f1fb92e600..df943324e3268bcdf962fc84dc5a3de43fe3f9da 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -12,7 +12,6 @@ linters:
     - errcheck
     - errorlint
     - gci
-    - gochecknoglobals
     - goimports
     - golint
     - gosimple
diff --git a/changelogs/unreleased/smh-enable-user-commit-files.yml b/changelogs/unreleased/smh-enable-user-commit-files.yml
deleted file mode 100644
index 2334da4d3e481cda2b2d122c67ccc50478d50739..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/smh-enable-user-commit-files.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable Go port of UserCommitFiles by default
-merge_request: 2922
-author:
-type: performance
diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go
index d9e2fb9f2935aad973f5b6f310d4e75ac3b3e9ac..d4f33cc582befd305c4cc553b9e2caa6fa3922e5 100644
--- a/internal/metadata/featureflag/feature_flags.go
+++ b/internal/metadata/featureflag/feature_flags.go
@@ -28,7 +28,7 @@ var (
 	// GoUserSquash enables the Go implementation of UserSquash
 	GoUserSquash = FeatureFlag{Name: "go_user_squash", OnByDefault: true}
 	// GoUserCommitFiles enables the Go implementation of UserCommitFiles
-	GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: true}
+	GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: false}
 	// GoResolveConflicts enables the Go implementation of ResolveConflicts
 	GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: false}
 	// GoUserUpdateSubmodule enables the Go implementation of