Backing out nvm workaround