diff --git a/runtime/exports.t4 b/runtime/exports.t4
index d145a311b82a..17a89b57f63d 100644
--- a/runtime/exports.t4
+++ b/runtime/exports.t4
@@ -537,10 +537,6 @@
 			"char**", "argv"
 		),
 
-		new Export ("void", "mono_jit_set_aot_only",
-			"mono_bool", "aot_only"
-		),
-
 		new Export ("void", "mono_jit_set_aot_mode",
 			"MonoAotMode", "mode"
 		),
diff --git a/runtime/monotouch-main.m b/runtime/monotouch-main.m
index 555181123696..76c068529ac2 100644
--- a/runtime/monotouch-main.m
+++ b/runtime/monotouch-main.m
@@ -393,7 +393,6 @@ - (void) memoryWarning: (NSNotification *) sender
 
 #if defined (__arm__) || defined(__aarch64__)
 	xamarin_register_modules ();
-	mono_jit_set_aot_only (TRUE);
 #endif
 	DEBUG_LAUNCH_TIME_PRINT ("\tAOT register time");
 
diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs
index 4d51b646ea5f..0ef8571d133b 100644
--- a/tools/mtouch/mtouch.cs
+++ b/tools/mtouch/mtouch.cs
@@ -663,7 +663,8 @@ public static string GenerateMain (Application app, IEnumerable<Assembly> assemb
 						sw.WriteLine ("\tmono_sgen_mono_ilgen_init ();");
 						sw.WriteLine ("\tmono_ee_interp_init (NULL);");
 						sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_INTERP);");
-					}
+					} else if (app.IsDeviceBuild)
+						sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_FULL);");
 
 					if (assembly_location.Length > 0)
 						sw.WriteLine ("\txamarin_set_assembly_directories (&assembly_locations);");