diff --git a/doc/rst/meta/modules/layoutdist.rst b/doc/rst/meta/modules/layoutdist.rst
index bf3c7f547a1..5ceab6b6611 100644
--- a/doc/rst/meta/modules/layoutdist.rst
+++ b/doc/rst/meta/modules/layoutdist.rst
@@ -27,11 +27,3 @@ and describe how domains and arrays are stored across them.
    :glob:
 
    dists/**
-
-
-Index
------
-
-* :ref:`Chapel Online Documentation Index <genindex>`
-
-.. COMMENT: clean this up before exposing:: * :chpl:chplref:`chplmodindex`
diff --git a/doc/rst/meta/modules/packages.rst b/doc/rst/meta/modules/packages.rst
index 26732f95f2a..a71a42f41b0 100644
--- a/doc/rst/meta/modules/packages.rst
+++ b/doc/rst/meta/modules/packages.rst
@@ -17,11 +17,3 @@ inclusion there.
    :glob:
 
    packages/*
-
-
-Index
------
-
-* :ref:`Chapel Online Documentation Index <genindex>`
-
-.. COMMENT: clean this up before exposing:: * :chpl:chplref:`chplmodindex`
diff --git a/doc/rst/meta/modules/standard.rst b/doc/rst/meta/modules/standard.rst
index 39487723232..80a8430a998 100644
--- a/doc/rst/meta/modules/standard.rst
+++ b/doc/rst/meta/modules/standard.rst
@@ -116,12 +116,3 @@ Utilities
    Regex <standard/Regex>
    Time <standard/Time>
    Version <standard/Version>
-
-
-
-Index
------
-
-* :ref:`Chapel Online Documentation Index <genindex>`
-
-.. COMMENT: clean this up before exposing:: * :chpl:chplref:`chplmodindex`
diff --git a/doc/rst/meta/templates/layout.html b/doc/rst/meta/templates/layout.html
index ef042ec3d9b..6f203789b7a 100644
--- a/doc/rst/meta/templates/layout.html
+++ b/doc/rst/meta/templates/layout.html
@@ -21,3 +21,11 @@
 {% include "searchbox.html" %}
 
 {% endblock %}
+
+{% block menu %}
+  {{ super() }}
+  <p class="caption" role="heading"><span class="caption-text">Chapel Documentation Index</span></p>
+  <ul>
+    <li class="toctree-11"><a class="reference internal" href="{{pathto('genindex.html', 1)}}">Index</a></li>
+  </ul>
+{% endblock %}