diff --git a/site/_includes/documentation-sidebar/1 b/site/_includes/documentation-sidebar/1
deleted file mode 120000
index e440e5c..0000000
--- a/site/_includes/documentation-sidebar/1
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/site/_includes/documentation-sidebar/1/sidebar.html b/site/_includes/documentation-sidebar/1/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/documentation-sidebar/1/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/site/_includes/documentation-sidebar/2 b/site/_includes/documentation-sidebar/2
deleted file mode 120000
index e440e5c..0000000
--- a/site/_includes/documentation-sidebar/2
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/site/_includes/documentation-sidebar/2/sidebar.html b/site/_includes/documentation-sidebar/2/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/documentation-sidebar/2/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/site/_includes/getting-started-sidebar/0 b/site/_includes/getting-started-sidebar/0
deleted file mode 120000
index bf0d87a..0000000
--- a/site/_includes/getting-started-sidebar/0
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/site/_includes/getting-started-sidebar/0/sidebar.html b/site/_includes/getting-started-sidebar/0/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/getting-started-sidebar/0/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/site/_includes/getting-started-sidebar/1 b/site/_includes/getting-started-sidebar/1
deleted file mode 120000
index bf0d87a..0000000
--- a/site/_includes/getting-started-sidebar/1
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/site/_includes/getting-started-sidebar/1/sidebar.html b/site/_includes/getting-started-sidebar/1/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/getting-started-sidebar/1/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/site/_includes/getting-started-sidebar/2 b/site/_includes/getting-started-sidebar/2
deleted file mode 120000
index bf0d87a..0000000
--- a/site/_includes/getting-started-sidebar/2
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/site/_includes/getting-started-sidebar/2/sidebar.html b/site/_includes/getting-started-sidebar/2/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/getting-started-sidebar/2/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/site/_includes/getting-started-sidebar/3 b/site/_includes/getting-started-sidebar/3
deleted file mode 120000
index bf0d87a..0000000
--- a/site/_includes/getting-started-sidebar/3
+++ /dev/null
@@ -1 +0,0 @@
-4
\ No newline at end of file
diff --git a/site/_includes/getting-started-sidebar/3/sidebar.html b/site/_includes/getting-started-sidebar/3/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/getting-started-sidebar/3/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/site/_includes/getting-started-sidebar/4 b/site/_includes/getting-started-sidebar/4
deleted file mode 120000
index 07b84d9..0000000
--- a/site/_includes/getting-started-sidebar/4
+++ /dev/null
@@ -1 +0,0 @@
-../documentation-sidebar/4
\ No newline at end of file
diff --git a/site/_includes/getting-started-sidebar/4/sidebar.html b/site/_includes/getting-started-sidebar/4/sidebar.html
new file mode 100644
index 0000000..83261d1
--- /dev/null
+++ b/site/_includes/getting-started-sidebar/4/sidebar.html
@@ -0,0 +1,228 @@
+<h3>Home</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/bazel-overview.html">Bazel overview</a></li>
+    <li><a href="/versions/{{ current_version }}/bazel-vision.html">Bazel vision</a></li>
+    <li><a href="/versions/{{ current_version }}/getting-started.html">Getting started</a></li>
+    <li><a href="/versions/{{ current_version }}/backward-compatibility.html">Backward compatibility</a></li>
+</ul>
+
+<h3>Installing Bazel</h3>
+<ul class="sidebar-nav">
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/install.html">Installation overview</a>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#installing-menu" aria-expanded="false"
+           aria-controls="installing-menu">
+            Installation steps<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="installing-menu">
+
+            <li><a href="/versions/{{ current_version }}/install-ubuntu.html">Ubuntu</a></li>
+            <li><a href="/versions/{{ current_version }}/install-redhat.html">Fedora/CentOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-os-x.html">macOS</a></li>
+            <li><a href="/versions/{{ current_version }}/install-windows.html">Windows</a></li>
+            <li><a href="/versions/{{ current_version }}/install-compile-source.html">Compiling from source</a></li>
+            <li><a href="/versions/{{ current_version }}/completion.html">Command-line completion</a></li>
+            <li><a href="/versions/{{ current_version }}/ide.html">Integrating with IDEs</a></li>
+        </ul>
+    </li>
+
+    <li class="sidebar-nav">
+        <a href="/versions/{{ current_version }}/updating-bazel.html">Updating Bazel</a>
+    </li>
+</ul>
+
+<h3>Tutorials</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/tutorial/cpp.html">C++</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/java.html">Java</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/android-app.html">Android</a></li>
+    <li><a href="/versions/{{ current_version }}/tutorial/ios-app.html">iOS</a></li>
+</ul>
+
+<h3>Using Bazel</h3>
+<ul class="sidebar-nav">
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#using-menu" aria-expanded="false"
+           aria-controls="using-menu">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="using-menu">
+            <li><a href="/versions/{{ current_version }}/build-ref.html">Core concepts</a></li>
+            <li><a href="/versions/{{ current_version }}/external.html">External dependencies</a></li>
+            <li><a href="/versions/{{ current_version }}/configurable-attributes.html">Configurable attributes</a></li>
+            <li><a href="/versions/main/platforms-intro.html">Platforms and toolchains</a></li>
+            <li><a href="/versions/main/visibility.html">Visibility</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#guides-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            Guides<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="guides-menu">
+            <li><a href="/versions/{{ current_version }}/guide.html">Running Bazel</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-creating-a-macro.html">Creating a macro</a></li>
+            <li><a href="/versions/{{ current_version }}/memory-saving-mode.html">Optimizing memory</a></li>
+            <li><a href="/versions/{{ current_version }}/windows.html">Building on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/rules.html">Rules</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#query-menu" aria-expanded="false"
+           aria-controls="query-menu">
+            Queries<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="query-menu">
+            <li><a href="/versions/{{ current_version }}/query-how-to.html">The query command</a></li>
+            <li><a href="/versions/{{ current_version }}/cquery.html">The cquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/aquery.html">The aquery command</a></li>
+            <li><a href="/versions/{{ current_version }}/query.html">Query language</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#best-practices-menu" aria-expanded="false"
+           aria-controls="best-practices-menu">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="best-practices-menu">
+            <li><a href="/versions/{{ current_version }}/best-practices.html">General best practices</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/tutorial-sharing-variables.html">Sharing BUILD variables</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-execution-menu" aria-expanded="false"
+           aria-controls="remote-execution-menu">
+            Remote execution<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-execution-menu">
+            <li><a href="/versions/{{ current_version }}/remote-execution.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-rules.html">Guidelines</a></li>
+            <li>
+                <a class="sidebar-nav-heading" data-toggle="collapse"
+                   href="#troubleshoot-remote-execution-menu" aria-expanded="false"
+                   aria-controls="troubleshoot-remote-execution-menu">
+                    Troubleshooting<span class="caret"></span>
+                </a>
+                <ul class="collapse sidebar-nav sidebar-submenu" id="troubleshoot-remote-execution-menu">
+                    <li><a href="/versions/{{ current_version }}/remote-execution-sandbox.html">Troubleshooting with Bazel sandbox</a></li>
+                    <li><a href="/versions/{{ current_version }}/workspace-log.html">Non-hermetic WORKSPACE rules</a></li>
+                    <li><a href="/versions/{{ current_version }}/remote-execution-caching-debug.html">Debugging remote cache hits</a></li>
+                </ul>
+            </li>
+            <li><a href="/versions/{{ current_version }}/remote-execution-ci.html">Remote execution and CI</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#remote-caching-menu" aria-expanded="false"
+           aria-controls="remote-caching-menu">
+            Remote caching<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="remote-caching-menu">
+            <li><a href="/versions/{{ current_version }}/remote-caching.html">Overview</a></li>
+            <li><a href="/versions/{{ current_version }}/remote-caching-debug.html">Debugging remote cache hits with local execution</a></li>
+        </ul>
+    </li>
+</ul>
+
+<h3>Reference</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/user-manual.html">Commands and options</a></li>
+    <li><a href="/versions/{{ current_version }}/glossary.html">Glossary</a></li>
+    <li><a href="/versions/{{ current_version }}/be/overview.html">Build encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/test-encyclopedia.html">Test encyclopedia</a></li>
+    <li><a href="/versions/{{ current_version }}/command-line-reference.html">Command line reference</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#build-files-menu" aria-expanded="false"
+           aria-controls="build-files-menu">
+            BUILD files<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="build-files-menu">
+            <li><a href="/versions/{{ current_version }}/be/functions.html">Functions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/common-definitions.html">Common rule definitions</a></li>
+            <li><a href="/versions/{{ current_version }}/be/make-variables.html">"Make" variables</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/build-style.html">BUILD style guide</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/build-event-protocol.html">Build Event Protocol</a></li>
+    <li><a href="/versions/{{ current_version }}/output_directories.html">Output directory layout</a></li>
+    <li><a href="/versions/{{ current_version }}/platforms.html">Platforms</a></li>
+    <li><a href="/versions/{{ current_version }}/exec-groups.html">Execution Groups</a></li>
+    <li><a href="/versions/{{ current_version }}/toolchains.html">Toolchains</a></li>
+</ul>
+
+<h3>Extending Bazel</h3>
+<ul class="sidebar-nav">
+    <li><a href="/versions/{{ current_version }}/skylark/concepts.html">Extension overview</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-concepts" aria-expanded="false"
+           aria-controls="starlark-concepts">
+            Concepts<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-concepts">
+            <li><a href="/versions/{{ current_version }}/skylark/macros.html">Macros</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/rules.html">Rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/depsets.html">Depsets</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/aspects.html">Aspects</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/repository_rules.html">Repository rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/config.html">Configurations</a></li>
+        </ul>
+    </li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#starlark-practices" aria-expanded="false"
+           aria-controls="starlark-practices">
+            Best practices<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="starlark-practices">
+            <li><a href="/versions/{{ current_version }}/skylark/bzl-style.html">.bzl style guide</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/testing.html">Testing extensions</a></li>
+            <li><a href="https://github.com/bazelbuild/stardoc">Documenting rules with Stardoc</a></li>
+            <li><a href="https://github.com/bazelbuild/buildtools/tree/master/buildifier">Linting</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/performance.html">Optimizing performance</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/deploying.html">Deploying rules</a></li>
+            <li><a href="/versions/{{ current_version }}/skylark/windows_tips.html">Writing rules on Windows</a></li>
+        </ul>
+    </li>
+
+    <li><a href="https://github.com/bazelbuild/examples/tree/HEAD/rules">Examples</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/lib/skylark-overview.html">Extensions API</a></li>
+
+    <li>
+        <a class="sidebar-nav-heading" data-toggle="collapse"
+           href="#persistent-workers" aria-expanded="false"
+           aria-controls="persistent-workers">
+            Persistent workers<span class="caret"></span>
+        </a>
+        <ul class="collapse sidebar-nav sidebar-submenu" id="persistent-workers">
+            <li><a href="/versions/{{ current_version }}/persistent-workers.html">Persistent workers</a></li>
+            <li><a href="/versions/{{ current_version }}/multiplex-worker.html">Multiplex workers</a></li>
+            <li><a href="/versions/{{ current_version }}/creating-workers.html">Creating persistent workers</a></li>
+        </ul>
+    </li>
+
+    <li><a href="/versions/{{ current_version }}/skylark/faq.html">FAQ</a></li>
+    <li><a href="/versions/{{ current_version }}/skylark/language.html">Starlark language</a></li>
+</ul>
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
index 3a4c3bc..57e85e1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -1381,29 +1381,25 @@
         e,
         outErrBuffer,
         errorTiming);
-    boolean reported = reportErrorIfNotAbortingMode(e, outErrBuffer);
-
-    ActionExecutionException toThrow = e;
-    if (reported) {
-      // If we already printed the error for the exception we mark it as already reported
-      // so that we do not print it again in upper levels.
-      // Note that we need to report it here since we want immediate feedback of the errors
-      // and in some cases the upper-level printing mechanism only prints one of the errors.
-      toThrow = new AlreadyReportedActionExecutionException(e);
-    }
-
-    // Now, return the exception to rethrow. This can have two effects:
+    // Return the exception to rethrow. This can have two effects:
     // If we're still building, the exception will get retrieved by the completor and rethrown.
     // If we're aborting, the exception will never be retrieved from the completor, since the
     // completor is waiting for all outstanding jobs to finish. After they have finished, it will
-    // only rethrow the exception that initially caused it to abort will and not check the exit
-    // status of any actions that had finished in the meantime.
-    return toThrow;
+    // only rethrow the exception that initially caused it to abort and not check the exit status of
+    // any actions that had finished in the meantime.
+
+    // If we already printed the error for the exception we mark it as already reported
+    // so that we do not print it again in upper levels.
+    // Note that we need to report it here since we want immediate feedback of the errors
+    // and in some cases the upper-level printing mechanism only prints one of the errors.
+    return printError(e.getMessage(), e.getAction(), outErrBuffer)
+        ? new AlreadyReportedActionExecutionException(e)
+        : e;
   }
 
   /**
-   * Enrich the exception so it can be confirmed as the primary action in a shared action set and so
-   * that, if rewinding fails, an ActionExecutedEvent can be published, and the error reported.
+   * Enriches the exception so it can be confirmed as the primary action in a shared action set and
+   * so that, if rewinding fails, an ActionExecutedEvent can be published, and the error reported.
    */
   private static void enrichLostInputsException(
       Path primaryOutputPath,
@@ -1599,27 +1595,24 @@
 
   /**
    * For the action 'action' that failed due to 'message' with the output 'actionOutput', notify the
-   * user about the error. To notify the user, the method first displays the output of the action
-   * and then reports an error via the reporter. The method ensures that the two messages appear
-   * next to each other by locking the outErr object where the output is displayed.
+   * user about the error. To notify the user, the method displays the output of the action and
+   * reports an error via the reporter.
    *
    * @param message The reason why the action failed
    * @param action The action that failed, must not be null.
    * @param actionOutput The output of the failed Action. May be null, if there is no output to
    *     display
+   * @return whether error was printed
    */
-  @SuppressWarnings("SynchronizeOnNonFinalField")
-  private void printError(
+  private boolean printError(
       String message, ActionAnalysisMetadata action, @Nullable FileOutErr actionOutput) {
     message = action.describe() + " failed: " + message;
-    Event event = Event.error(action.getOwner().getLocation(), message);
-    synchronized (reporter) {
-      dumpRecordedOutErr(reporter, event, actionOutput);
-    }
+    return dumpRecordedOutErr(
+        reporter, Event.error(action.getOwner().getLocation(), message), actionOutput);
   }
 
   /**
-   * Dump the output from the action.
+   * Dumps the output from the action.
    *
    * @param action The action whose output is being dumped
    * @param outErrBuffer The OutErr that recorded the actions output
@@ -1635,16 +1628,20 @@
   }
 
   /**
-   * Dump the output from the action.
+   * Dumps output from the action along with {@code prefixEvent} if the build is not aborting.
    *
    * @param prefixEvent An event to post before dumping the output
    * @param outErrBuffer The OutErr that recorded the actions output
+   * @return whether output was displayed (false if aborting)
    */
-  private void dumpRecordedOutErr(
+  private boolean dumpRecordedOutErr(
       EventHandler eventHandler, Event prefixEvent, FileOutErr outErrBuffer) {
-    // Only print the output if we're not winding down.
+    // For some actions (e.g., many local actions) the pollInterruptedStatus()
+    // won't notice that we had an interrupted job. It will continue.
+    // For that reason we must take care to NOT report errors if we're
+    // in the 'aborting' mode: Any cancelled action would show up here.
     if (isBuilderAborting()) {
-      return;
+      return false;
     }
     if (outErrBuffer != null && outErrBuffer.hasRecordedOutput()) {
       // Bind the output to the prefix event.
@@ -1652,6 +1649,7 @@
     } else {
       eventHandler.handle(prefixEvent);
     }
+    return true;
   }
 
   private static void reportActionExecution(
@@ -1693,32 +1691,6 @@
             isInMemoryFs));
   }
 
-  /**
-   * Returns true if the exception was reported. False otherwise. Currently this is a copy of what
-   * we did in pre-Skyframe execution. The main implication is that we are printing the error to the
-   * top level reporter instead of the action reporter. Because of that Skyframe values do not know
-   * about the errors happening in the execution phase. Even if we change in the future to log to
-   * the action reporter (that would be done in ActionExecutionFunction.compute() when we get an
-   * ActionExecutionException), we probably do not want to also store the StdErr output, so
-   * dumpRecordedOutErr() should still be called here.
-   */
-  @SuppressWarnings("SynchronizeOnNonFinalField")
-  private boolean reportErrorIfNotAbortingMode(
-      ActionExecutionException ex, FileOutErr outErrBuffer) {
-    // For some actions (e.g., many local actions) the pollInterruptedStatus()
-    // won't notice that we had an interrupted job. It will continue.
-    // For that reason we must take care to NOT report errors if we're
-    // in the 'aborting' mode: Any cancelled action would show up here.
-    synchronized (this.reporter) {
-      if (!isBuilderAborting()) {
-        // Oops. The action aborted. Report the problem.
-        printError(ex.getMessage(), ex.getAction(), outErrBuffer);
-        return true;
-      }
-    }
-    return false;
-  }
-
   /** An object supplying data for action execution progress reporting. */
   public interface ProgressSupplier {
     /** Returns the progress string to prefix action execution messages with. */