Reverted changes from npm branch for PR.