This reverts commit 14dfbc13.
This issue has already been fixed after pip 8.0.1 released.

TrivialFix

Change-Id: Ie559286beac56aa5ac35addd647c1d342ba6562b