Previous commit and fix works only with pip 1.5+.