diff --git a/src/Xamarin.Android.Build.Tasks/Resources/MonoRuntimeProvider.Bundled.java b/src/Xamarin.Android.Build.Tasks/Resources/MonoRuntimeProvider.Bundled.java
index 9fb0f4f636b..2af2fef566b 100644
--- a/src/Xamarin.Android.Build.Tasks/Resources/MonoRuntimeProvider.Bundled.java
+++ b/src/Xamarin.Android.Build.Tasks/Resources/MonoRuntimeProvider.Bundled.java
@@ -21,15 +21,12 @@ public void attachInfo (android.content.Context context, android.content.pm.Prov
 		// Mono Runtime Initialization {{{
 		android.content.pm.ApplicationInfo applicationInfo = context.getApplicationInfo ();
 		String[] apks = null;
-		if (android.os.Build.VERSION.SDK_INT >= 21) {
-			String[] splitApks = applicationInfo.splitPublicSourceDirs;
-			if (splitApks != null && splitApks.length > 0) {
-				apks = new String[splitApks.length + 1];
-				apks [0] = applicationInfo.sourceDir;
-				System.arraycopy (splitApks, 0, apks, 1, splitApks.length);
-			}
-		}
-		if (apks == null) {
+		String[] splitApks = applicationInfo.splitSourceDirs;
+		if (splitApks != null && splitApks.length > 0) {
+			apks = new String[splitApks.length + 1];
+			apks [0] = applicationInfo.sourceDir;
+			System.arraycopy (splitApks, 0, apks, 1, splitApks.length);
+		} else {
 			apks = new String[] { applicationInfo.sourceDir };
 		}
 		mono.MonoPackageManager.LoadApplication (context, applicationInfo, apks);
@@ -67,4 +64,3 @@ public int update (android.net.Uri uri, android.content.ContentValues values, St
 		throw new RuntimeException ("This operation is not supported.");
 	}
 }
-
diff --git a/src/java-runtime/java/mono/android/MonoPackageManager.java b/src/java-runtime/java/mono/android/MonoPackageManager.java
index 89f43542529..fa6ed7be7fc 100644
--- a/src/java-runtime/java/mono/android/MonoPackageManager.java
+++ b/src/java-runtime/java/mono/android/MonoPackageManager.java
@@ -58,13 +58,7 @@ public static void LoadApplication (Context context, ApplicationInfo runtimePack
 				// Should the order change here, src/monodroid/jni/SharedConstants.hh must be updated accordingly
 				//
 				String[] appDirs = new String[] {filesDir, cacheDir, dataDir};
-				boolean haveSplitApks = false;
-
-				if (android.os.Build.VERSION.SDK_INT >= 21) {
-					if (runtimePackage.splitSourceDirs != null) {
-						haveSplitApks = runtimePackage.splitSourceDirs.length > 1;
-					}
-				}
+				boolean haveSplitApks = runtimePackage.splitSourceDirs != null && runtimePackage.splitSourceDirs.length > 0;
 
 				//
 				// Preload DSOs libmonodroid.so depends on so that the dynamic