Switch back to mainline npmjs at v2.0.4