diff --git a/docs/reference/pip_download.rst b/docs/reference/pip_download.rst
index bf3e4c9898d..466b3e5775e 100644
--- a/docs/reference/pip_download.rst
+++ b/docs/reference/pip_download.rst
@@ -55,66 +55,66 @@ Options
 Examples
 ********
 
-1. Download a package and all of its dependencies
-
-  ::
-
-    $ pip download SomePackage
-    $ pip download -d . SomePackage  # equivalent to above
-    $ pip download --no-index --find-links=/tmp/wheelhouse -d /tmp/otherwheelhouse SomePackage
-
-2. Download a package and all of its dependencies with OSX specific interpreter constraints.
-   This forces OSX 10.10 or lower compatibility. Since OSX deps are forward compatible,
-   this will also match ``macosx-10_9_x86_64``, ``macosx-10_8_x86_64``, ``macosx-10_8_intel``,
-   etc.
-   It will also match deps with platform ``any``.  Also force the interpreter version to ``27``
-   (or more generic, i.e. ``2``) and implementation to ``cp`` (or more generic, i.e. ``py``).
-
-  ::
-
-    $ pip download \
-        --only-binary=:all: \
-        --platform macosx-10_10_x86_64 \
-        --python-version 27 \
-        --implementation cp \
-        SomePackage
-
-3.  Download a package and its dependencies with linux specific constraints, including
-    packages that support the ``manylinux1`` platform.  Force the interpreter to be any
-    minor version of py3k, and only accept ``cp34m`` or ``none`` as the abi.
-
-  ::
-
-    $ pip download \
-        --only-binary=:all: \
-        --platform linux_x86_64 --manylinux \
-        --python-version 3 \
-        --implementation cp \
-        --abi cp34m \
-        SomePackage
-
-4.  Force platform, implementation, and abi agnostic deps.
-
-  ::
-
-    $ pip download \
-        --only-binary=:all: \
-        --platform any \
-        --python-version 3 \
-        --implementation py \
-        --abi none \
-        SomePackage
-
-5.  Even when overconstrained, this will still correctly fetch the pip universal wheel.
-
-  ::
-
-    $ pip download \
-        --only-binary=:all: \
-        --platform linux_x86_64 --manylinux \
-        --python-version 33 \
-        --implementation cp \
-        --abi cp34m \
-        pip>=8
-    $ ls pip-8.1.1-py2.py3-none-any.whl
-    pip-8.1.1-py2.py3-none-any.whl
+#.  Download a package and all of its dependencies
+
+    ::
+
+      $ pip download SomePackage
+      $ pip download -d . SomePackage  # equivalent to above
+      $ pip download --no-index --find-links=/tmp/wheelhouse -d /tmp/otherwheelhouse SomePackage
+
+#.  Download a package and all of its dependencies with OSX specific interpreter constraints.
+    This forces OSX 10.10 or lower compatibility. Since OSX deps are forward compatible,
+    this will also match ``macosx-10_9_x86_64``, ``macosx-10_8_x86_64``, ``macosx-10_8_intel``,
+    etc.
+    It will also match deps with platform ``any``.  Also force the interpreter version to ``27``
+    (or more generic, i.e. ``2``) and implementation to ``cp`` (or more generic, i.e. ``py``).
+
+    ::
+
+      $ pip download \
+          --only-binary=:all: \
+          --platform macosx-10_10_x86_64 \
+          --python-version 27 \
+          --implementation cp \
+          SomePackage
+
+#.  Download a package and its dependencies with linux specific constraints.
+    Force the interpreter to be any minor version of py3k, and only accept
+    ``cp34m`` or ``none`` as the abi.
+
+    ::
+
+      $ pip download \
+          --only-binary=:all: \
+          --platform linux_x86_64 \
+          --python-version 3 \
+          --implementation cp \
+          --abi cp34m \
+          SomePackage
+
+#.  Force platform, implementation, and abi agnostic deps.
+
+    ::
+
+      $ pip download \
+          --only-binary=:all: \
+          --platform any \
+          --python-version 3 \
+          --implementation py \
+          --abi none \
+          SomePackage
+
+#.  Even when overconstrained, this will still correctly fetch the pip universal wheel.
+
+    ::
+
+      $ pip download \
+          --only-binary=:all: \
+          --platform linux_x86_64 \
+          --python-version 33 \
+          --implementation cp \
+          --abi cp34m \
+          pip>=8
+      $ ls pip-8.1.1-py2.py3-none-any.whl
+      pip-8.1.1-py2.py3-none-any.whl
diff --git a/pip/index.py b/pip/index.py
index db08b001698..24b97900f4a 100644
--- a/pip/index.py
+++ b/pip/index.py
@@ -172,10 +172,6 @@ def __init__(self, find_links, index_urls, allow_all_prereleases=False,
             abi=abi,
             impl=implementation,
         )
-        self.valid_tags_noarch = get_supported(
-            versions=versions,
-            noarch=True
-        )
 
         # If we don't have TLS enabled, then WARN if anyplace we're looking
         # relies on TLS.