diff --git a/index.js b/index.js
index 194348cc..20f86ed7 100644
--- a/index.js
+++ b/index.js
@@ -52,10 +52,19 @@ exports.GenerateBundleStarterPlugin.prototype = {
         compiler.plugin("emit", function (compilation, cb) {
             compilation.assets["package.json"] = plugin.generatePackageJson();
             compilation.assets["starter.js"] = plugin.generateStarterModule();
+            plugin.generateTnsJavaClasses(compilation);
 
             cb();
         });
     },
+    generateTnsJavaClasses: function (compilation) {
+        const path = compilation.compiler.outputPath;
+        const isAndroid = path.indexOf("android") > -1;
+
+        if (isAndroid) {
+            compilation.assets["tns-java-classes.js"] = new sources.RawSource("");
+        }
+    },
     generatePackageJson: function () {
         var packageJsonPath = path.join(this.webpackContext, "package.json");
         var packageData = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
diff --git a/webpack.common.js.angular.template b/webpack.common.js.angular.template
index ec7934ae..57f2916d 100644
--- a/webpack.common.js.angular.template
+++ b/webpack.common.js.angular.template
@@ -19,19 +19,11 @@ module.exports = function (platform, destinationApp) {
     // app.css bundle
     entry["app.css"] = "./app.css";
 
-    // Vendor libs go to the vendor.js chunk
-    var commonsChunkNames = ["vendor"];
-
-    // Compatibility workaround with NativeScript 2.5 Android runtime
-    // https://github.com/NativeScript/NativeScript/issues/3947
-     if (platform === "android") {
-        commonsChunkNames.push("tns-java-classes");
-    }
-
     var plugins = [
         new ExtractTextPlugin("app.css"),
         new webpack.optimize.CommonsChunkPlugin({
-            name: commonsChunkNames
+            // Vendor libs go to the vendor.js chunk
+            name: ["vendor"]
         }),
         // Define useful constants like TNS_WEBPACK
         new webpack.DefinePlugin({
diff --git a/webpack.common.js.javascript.template b/webpack.common.js.javascript.template
index 30dc3f2a..6b397063 100644
--- a/webpack.common.js.javascript.template
+++ b/webpack.common.js.javascript.template
@@ -18,19 +18,10 @@ module.exports = function (platform, destinationApp) {
     // app.css bundle
     entry["app.css"] = "./app.css";
 
-    // Vendor libs go to the vendor.js chunk
-    var commonsChunkNames = ["vendor"];
-
-    // Compatibility workaround with NativeScript 2.5 Android runtime
-    // https://github.com/NativeScript/NativeScript/issues/3947
-     if (platform === "android") {
-        commonsChunkNames.push("tns-java-classes");
-    }
-
     var plugins = [
         new ExtractTextPlugin("app.css"),
         new webpack.optimize.CommonsChunkPlugin({
-            name: commonsChunkNames
+            name: ["vendor"]
         }),
         // Define useful constants like TNS_WEBPACK
         new webpack.DefinePlugin({
diff --git a/webpack.common.js.typescript.template b/webpack.common.js.typescript.template
index f46f8dfd..464bb493 100644
--- a/webpack.common.js.typescript.template
+++ b/webpack.common.js.typescript.template
@@ -18,19 +18,10 @@ module.exports = function (platform, destinationApp) {
     // app.css bundle
     entry["app.css"] = "./app.css";
 
-    // Vendor libs go to the vendor.js chunk
-    var commonsChunkNames = ["vendor"];
-
-    // Compatibility workaround with NativeScript 2.5 Android runtime
-    // https://github.com/NativeScript/NativeScript/issues/3947
-     if (platform === "android") {
-        commonsChunkNames.push("tns-java-classes");
-    }
-
     var plugins = [
         new ExtractTextPlugin("app.css"),
         new webpack.optimize.CommonsChunkPlugin({
-            name: commonsChunkNames
+            name: ["vendor"]
         }),
         // Define useful constants like TNS_WEBPACK
         new webpack.DefinePlugin({