Engulf node into master, revert last commit