diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 27319e6d9..16dc55c78 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1320,8 +1320,8 @@ class Coder:
         return context
 
     def auto_commit(self, edited):
-        context = self.get_context_from_history(self.cur_messages)
-        res = self.repo.commit(fnames=edited, context=context, prefix="aider: ")
+        # context = self.get_context_from_history(self.cur_messages)
+        res = self.repo.commit(fnames=edited, prefix="aider: ")
         if res:
             commit_hash, commit_message = res
             self.last_aider_commit_hash = commit_hash
diff --git a/aider/repo.py b/aider/repo.py
index f52f4f98f..666a8f084 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -79,8 +79,8 @@ class GitRepo:
             commit_message = prefix + commit_message
 
         full_commit_message = commit_message
-        # if context:
-        #    full_commit_message += "\n\n# Aider chat conversation:\n\n" + context
+        if context:
+            full_commit_message += "\n\n# Aider chat conversation:\n\n" + context
 
         cmd = ["-m", full_commit_message, "--no-verify"]
         if fnames: