Revert "Issue #9: Port to pip v1.5.4"

This reverts commit 3d334f6d3997832ca8650be33594bda1fa171d14.