Re-fixed the pypirc handler monkey-patching. This needs fixing properly at some stage.