A better version of our patch

However, the better version involves taking some changes from a version
of npm not yet released with Node.