Remove npm upgrade workaround scripts
Remerge latest changes with mbynens' repo.