missing piece of pervious commit
npmconf branch rebased against master