diff --git a/CHANGES.txt b/CHANGES.txt
index 2bb6b8dba42..9986b0e46c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,8 +3,6 @@
 * **PROCESS** Version numbers are now simply ``X.Y`` where the leading ``1``
   has been dropped.
 
-* Fixed :issue:`1873`. Silence byte compile errors when installation succeed.
-
 * **BACKWARD INCOMPATIBLE** Dropped support for Python 3.1.
 
 * **BACKWARD INCOMPATIBLE** Removed the bundle support which was deprecated in
@@ -22,6 +20,12 @@
   until their removal in pip v8.0. For more information please see
   https://pip.pypa.io/en/latest/reference/pip_install.html#caching
 
+* **DEPRECATION** ``pip install --build`` and ``pip install --no-clean`` are now
+  *NOT* deprecated.  This reverses the deprecation that occurred in v1.5.3. See
+  :issue:`906` for discussion.
+
+* Fixed :issue:`1873`. Silence byte compile errors when installation succeed.
+
 * Added a virtualenv-specific configuration file. (:pull:`1364`)
 
 * Added site-wide configuation files. (:pull:`1978`)
diff --git a/pip/commands/install.py b/pip/commands/install.py
index a7f1c5257a8..030ddc003f5 100644
--- a/pip/commands/install.py
+++ b/pip/commands/install.py
@@ -199,13 +199,11 @@ def run(self, options, args):
 
         if (
             options.no_install or
-            options.no_download or
-            (options.build_dir != build_prefix) or
-            options.no_clean
+            options.no_download
         ):
             warnings.warn(
-                "--no-install, --no-download, --build, and --no-clean are "
-                "deprecated. See https://github.com/pypa/pip/issues/906.",
+                "--no-install and --no-download are deprecated. "
+                "See https://github.com/pypa/pip/issues/906.",
                 RemovedInPip7Warning,
             )