diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts
index 1cfaa771d529..2e888f72b429 100644
--- a/addon/ng2/models/webpack-build-common.ts
+++ b/addon/ng2/models/webpack-build-common.ts
@@ -22,16 +22,6 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
       filename: '[name].bundle.js'
     },
     module: {
-      preLoaders: [
-        {
-          test: /\.js$/,
-          loader: 'source-map-loader',
-          exclude: [
-            path.resolve(projectRoot, 'node_modules/rxjs'),
-            path.resolve(projectRoot, 'node_modules/@angular'),
-          ]
-        }
-      ],
       loaders: [
         {
           test: /\.ts$/,
diff --git a/addon/ng2/models/webpack-build-development.ts b/addon/ng2/models/webpack-build-development.ts
index 3465a28bf4c0..15feea54287b 100644
--- a/addon/ng2/models/webpack-build-development.ts
+++ b/addon/ng2/models/webpack-build-development.ts
@@ -11,6 +11,14 @@ export const getWebpackDevConfigPartial = function(projectRoot: string, sourceDi
       sourceMapFilename: '[name].map',
       chunkFilename: '[id].chunk.js'
     },
+    module: {
+      preLoaders: [
+        {
+          test: /\.js$/,
+          loader: 'source-map-loader'
+        }
+      ]
+    },
     tslint: {
       emitErrors: false,
       failOnHint: false,
diff --git a/addon/ng2/models/webpack-build-production.ts b/addon/ng2/models/webpack-build-production.ts
index 9866b7add430..ba7b1ef4fcb6 100644
--- a/addon/ng2/models/webpack-build-production.ts
+++ b/addon/ng2/models/webpack-build-production.ts
@@ -15,6 +15,17 @@ export const getWebpackProdConfigPartial = function(projectRoot: string, sourceD
       sourceMapFilename: '[name].[chunkhash].bundle.map',
       chunkFilename: '[id].[chunkhash].chunk.js'
     },
+    module: {
+      preLoaders: [
+        {
+          test: /\.js$/,
+          loader: 'source-map-loader',
+          exclude: [
+            /node_modules/ // don't pull in vendor sourcemaps for production builds, increased speed for build
+          ]
+        }
+      ]
+    },
     plugins: [
       new WebpackMd5Hash(),
       new webpack.optimize.DedupePlugin(),
diff --git a/addon/ng2/models/webpack-build-utils.ts b/addon/ng2/models/webpack-build-utils.ts
index dcaa15558593..579ee34662cd 100644
--- a/addon/ng2/models/webpack-build-utils.ts
+++ b/addon/ng2/models/webpack-build-utils.ts
@@ -19,5 +19,6 @@ export const webpackDevServerOutputOptions = {
   hash: true,
   timings: true,
   chunks: false,
-  chunkModules: false
+  chunkModules: false,
+  warnings: false
 }