diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f131f97179..8a0f8084c53 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/debug.el (debugger-setup-buffer): Revert local change to
+	print depth and length.
+
 2011-03-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/cl-macs.el (cl-byte-compile-block, cl-block-wrapper)
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 0bdab919434..88633eaaa46 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -269,10 +269,8 @@ That buffer should be current already."
   (setq buffer-undo-list t)
   (let ((standard-output (current-buffer))
 	(print-escape-newlines t)
-        (print-quoted t)                ;Doesn't seem to work :-(
-	(print-level 1000)              ;8
-	;; (print-length 50)
-        )
+	(print-level 8)
+	(print-length 50))
     (backtrace))
   (goto-char (point-min))
   (delete-region (point)