I didn't get *all* the changes from https://github.com/pypa/pip/pull/1792/