diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92812f1ad141c4d5a808d0932967283e3f530987..b23673a9e41af4e398fd78c381216969a43391a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,17 +12,11 @@ cache:
   paths:
   - .gradle/
 
-build-without-auto-install:
+build:
   stage: build
   script:
   - ./gradlew build
   artifacts:
     paths:
     - app/build/outputs/apk/
-
-build:
-  extends: build-without-auto-install
-  script:
-  - git apply auto-install.patch
-  - ./gradlew build
   
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/apps/application/model/Installer.kt b/app/src/main/java/foundation/e/apps/application/model/Installer.kt
index ef4bed07f54ed59fc81e83122d819e609c67d987..cb90b5c036dafb2448492cc470681906afcb9af4 100644
--- a/app/src/main/java/foundation/e/apps/application/model/Installer.kt
+++ b/app/src/main/java/foundation/e/apps/application/model/Installer.kt
@@ -17,13 +17,15 @@
 
 package foundation.e.apps.application.model
 
+import android.Manifest
 import android.app.PendingIntent
 import android.content.*
 import android.content.pm.PackageInstaller
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.support.v4.content.ContextCompat
 import android.support.v4.content.FileProvider
 import android.util.Log
-import foundation.e.apps.utils.Common
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -37,7 +39,8 @@ class Installer(private val packageName: String,
     fun install(context: Context) {
         try {
             Log.i(TAG, "Installing $packageName")
-            if (Common.isSystemApp(context.packageManager, context.packageName)) {
+            if (ContextCompat.checkSelfPermission(context, Manifest.permission.INSTALL_PACKAGES)
+                    == PackageManager.PERMISSION_GRANTED) {
                 val inputStream = File(apk.absolutePath).inputStream()
                 Log.i(TAG, "Opened input stream to $packageName APK")
                 installApplication(context, inputStream)
diff --git a/auto-install.patch b/auto-install.patch
deleted file mode 100644
index 22c125ade13685215330079859b27019116f4cb1..0000000000000000000000000000000000000000
--- a/auto-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
-index e3d84c2..a1a0c47 100644
---- a/app/src/main/AndroidManifest.xml
-+++ b/app/src/main/AndroidManifest.xml
-@@ -20,7 +20,8 @@
- <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:tools="http://schemas.android.com/tools"
-     package="foundation.e.apps"
--    android:installLocation="internalOnly">
-+    android:installLocation="internalOnly"
-+    android:sharedUserId="android.uid.system">
- 
-     <uses-permission android:name="android.permission.INTERNET" />
-     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />