From 98b2885e853139ab64eddec00b7700313cca331b Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 15 Aug 2014 07:21:24 -0700
Subject: [PATCH] Revert "Upgrade Node to 0.10.30. Fix npm bug again."

This reverts commit 56ff54b0859f2655a05937264be114bb53f146fb.
---
 History.md                     | 1 -
 docs/client/concepts.html      | 2 +-
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 5 ++---
 tools/bundler.js               | 2 +-
 tools/main.js                  | 2 +-
 tools/server/boot.js           | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/History.md b/History.md
index 0630e805ce..fdf6312091 100644
--- a/History.md
+++ b/History.md
@@ -10,7 +10,6 @@
   failure on the server. (This matches the behavior described in our docs)
 
 * Upgraded dependencies:
-  - Node: 0.10.30 (from 0.10.29)
   - less: 1.7.4 (from 1.7.1)
 
 ## v0.8.3
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index c4214b3f83..3d09fd0f7d 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -739,7 +739,7 @@ To get started, run
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.30; older versions contain a serious bug that can cause production servers
+0.10.29; older versions contain a serious bug that can cause production servers
 to stall.) You can then run the application by invoking node, specifying the
 HTTP port for the application to listen on, and the MongoDB endpoint.  If
 you don't already have a MongoDB server, we can recommend our friends at
diff --git a/meteor b/meteor
index ca8b120201..27a5573a95 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.47 # warning! 0.3.46 used on cordova-hcp branch
+BUNDLE_VERSION=0.3.44 # warning! 0.3.46 used on cordova-hcp branch
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 20a9f93829..1f2ec3e89c 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -71,13 +71,12 @@ umask 022
 mkdir build
 cd build
 
-# For now, use our fork with https://github.com/npm/npm/pull/5821/files
-git clone https://github.com/meteor/node.git
+git clone https://github.com/joyent/node.git
 cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/main.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.30-with-npm-5821
+git checkout v0.10.29
 
 ./configure --prefix="$DIR"
 make -j4
diff --git a/tools/bundler.js b/tools/bundler.js
index 1e24356118..73b4d66170 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1546,7 +1546,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
 
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one external dependency:\n" +
-"Node.js 0.10.30 or newer. To run the application:\n" +
+"Node.js 0.10.29 or newer. To run the application:\n" +
 "\n" +
 "  $ (cd programs/server && npm install)\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/main.js b/tools/main.js
index 7ad1ab1613..af4f8124f5 100644
--- a/tools/main.js
+++ b/tools/main.js
@@ -411,7 +411,7 @@ Fiber(function () {
 
   // Check required Node version.
   // This code is duplicated in tools/server/boot.js.
-  var MIN_NODE_VERSION = 'v0.10.30';
+  var MIN_NODE_VERSION = 'v0.10.29';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
index ecad91f1c7..f55a8f38a9 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/main.js.
-var MIN_NODE_VERSION = 'v0.10.30';
+var MIN_NODE_VERSION = 'v0.10.29';
 
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(