diff --git a/core/core-configuration-layer.el b/core/core-configuration-layer.el
index a487d7bd7..e2c1d20ff 100644
--- a/core/core-configuration-layer.el
+++ b/core/core-configuration-layer.el
@@ -889,11 +889,15 @@ Return nil if package object is not found."
   "Return a sorted list of PACKAGES objects."
   (sort packages (lambda (x y) (string< (symbol-name x) (symbol-name y)))))
 
-(defun configuration-layer/make-all-packages (&optional usedp)
-  "Create objects for _all_ packages.
-USEDP if non-nil indicates that made packages are used packages."
-  (configuration-layer/make-packages-from-layers
-   (configuration-layer/get-layers-list) usedp))
+(defun configuration-layer/make-all-packages ()
+  "Create objects for _all_ packages supported by Spacemacs."
+  (let ((all-layers (configuration-layer/get-layers-list))
+        (configuration-layer--load-packages-files t)
+        (configuration-layer--package-properties-read-onlyp t)
+        (configuration-layer--inhibit-warnings t))
+    (configuration-layer/discover-layers)
+    (configuration-layer/declare-layers all-layers)
+    (configuration-layer/make-packages-from-layers all-layers)))
 
 (defun configuration-layer/make-packages-from-layers
     (layer-names &optional usedp)
diff --git a/layers/+completion/helm/local/helm-spacemacs-help/helm-spacemacs-help.el b/layers/+completion/helm/local/helm-spacemacs-help/helm-spacemacs-help.el
index c42a637e1..ee1b37604 100644
--- a/layers/+completion/helm/local/helm-spacemacs-help/helm-spacemacs-help.el
+++ b/layers/+completion/helm/local/helm-spacemacs-help/helm-spacemacs-help.el
@@ -44,13 +44,8 @@
 
 (defun helm-spacemacs-help//init (&optional arg)
   (when (or arg (null helm-spacemacs--initialized))
-    (let ((configuration-layer--load-packages-files t)
-          (configuration-layer--package-properties-read-onlyp t)
-          (configuration-layer--inhibit-warnings t))
-      (configuration-layer/discover-layers)
-      (configuration-layer/declare-layers (configuration-layer/get-layers-list))
-      (configuration-layer/make-all-packages)
-      (setq helm-spacemacs--initialized t))))
+    (configuration-layer/make-all-packages)
+    (setq helm-spacemacs--initialized t)))
 
 ;;;###autoload
 (defun helm-spacemacs-help (arg)
diff --git a/layers/+completion/ivy/local/ivy-spacemacs-help/ivy-spacemacs-help.el b/layers/+completion/ivy/local/ivy-spacemacs-help/ivy-spacemacs-help.el
index fdef1af20..5db6e3fcd 100644
--- a/layers/+completion/ivy/local/ivy-spacemacs-help/ivy-spacemacs-help.el
+++ b/layers/+completion/ivy/local/ivy-spacemacs-help/ivy-spacemacs-help.el
@@ -42,13 +42,8 @@
 
 (defun ivy-spacemacs-help//init (&optional arg)
   (when (or arg (null ivy-spacemacs--initialized))
-    (let ((configuration-layer--load-packages-files t)
-          (configuration-layer--package-properties-read-onlyp t)
-          (configuration-layer--inhibit-warnings t))
-      (configuration-layer/discover-layers)
-      (configuration-layer/declare-layers (configuration-layer/get-layers-list))
-      (configuration-layer/make-all-packages)
-      (setq ivy-spacemacs--initialized t))))
+    (configuration-layer/make-all-packages)
+    (setq ivy-spacemacs--initialized t)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Docs