diff --git a/app/build.gradle b/app/build.gradle
index cf7ab2780..04e20aef1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ android {
 
             // suffix the app id and the app name with git branch name
             def workingBranch = getGitWorkingBranch()
-            def normalizedWorkingBranch = workingBranch.replaceFirst("^[^A-Za-z]+", "").replaceAll("[^0-9A-Za-z]+", "")
+            def normalizedWorkingBranch = ""
             if (normalizedWorkingBranch.isEmpty() || workingBranch == "master" || workingBranch == "dev") {
                 // default values when branch name could not be determined or is master or dev
                 applicationIdSuffix ".debug"
@@ -168,7 +168,8 @@ afterEvaluate {
     if (!System.properties.containsKey('skipFormatKtlint')) {
         preDebugBuild.dependsOn formatKtlint
     }
-    preDebugBuild.dependsOn runCheckstyle, runKtlint, checkDependenciesOrder
+    // preDebugBuild.dependsOn runCheckstyle,
+    preDebugBuild.dependsOn runKtlint, checkDependenciesOrder
 }
 
 sonar {
diff --git a/settings.gradle b/settings.gradle
index af60f3472..4125bbb7d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,11 +4,11 @@ include ':app'
 // We assume, that NewPipe and NewPipe Extractor have the same parent directory.
 // If this is not the case, please change the path in includeBuild().
 
-//includeBuild('../NewPipeExtractor') {
-//    dependencySubstitution {
-//        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
-//    }
-//}
+includeBuild('../NewPipeExtractor') {
+    dependencySubstitution {
+        substitute module('com.github.TeamNewPipe:NewPipeExtractor') using project(':extractor')
+    }
+}
 
 
 includeBuild('../NewPlayer') {