diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b115e5c5d5..32540b213dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-03  Glenn Morris  <rgm@gnu.org>
+
+	* help-macro.el (three-step-help):
+	Revert 2012-09-29 change.  (Bug#12567)
+
 2012-10-03  Martin Rudalics  <rudalics@gmx.at>
 
 	* menu-bar.el (kill-this-buffer): Don't do anything when
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 0600484b6df..63ae02eb90d 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -69,6 +69,11 @@
 
 (require 'backquote)
 
+;; This needs to be autoloaded because it is used in the
+;; make-help-screen macro.  Using (bound-and-true-p three-step-help)
+;; is not an acceptable alternative, because nothing loads help-macro
+;; in a normal session, so any user customization would never be applied.
+;;;###autoload
 (defcustom three-step-help nil
   "Non-nil means give more info about Help command in three steps.
 The three steps are simple prompt, prompt with all options, and