diff --git a/config/initializers/ar_monkey_patch.rb b/config/initializers/active_record_locking.rb
similarity index 100%
rename from config/initializers/ar_monkey_patch.rb
rename to config/initializers/active_record_locking.rb
diff --git a/config/initializers/active_record_preloader.rb b/config/initializers/active_record_preloader.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3b16014f30296e4c410e71b7bd61456df7212eb2
--- /dev/null
+++ b/config/initializers/active_record_preloader.rb
@@ -0,0 +1,15 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      module NoCommitPreloader
+        def preloader_for(reflection, owners, rhs_klass)
+          return NullPreloader if rhs_klass == ::Commit
+
+          super
+        end
+      end
+
+      prepend NoCommitPreloader
+    end
+  end
+end