diff --git a/project/java/Globals.java b/project/java/Globals.java
index 53b0c1b44..000566fe0 100644
--- a/project/java/Globals.java
+++ b/project/java/Globals.java
@@ -112,5 +112,4 @@ class Globals
 	public static boolean VideoLinearFilter = true;
 	public static boolean MultiThreadedVideo = false;
 	public static boolean BrokenLibCMessageShown = false;
-	public static boolean IsOuya = false; // Ouya game console has no Back key, so we need to map some game controller key to Back key
 }
diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 84d9e1e74..482fea363 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -93,18 +93,6 @@ public class MainActivity extends Activity
 			getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
 					WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-		if( getIntent().getCategories() != null )
-		{
-			for( String cat: getIntent().getCategories() )
-			{
-				System.out.println("libSDL: getIntent().getCategories(): " + cat);
-				if( cat.equals("ouya.intent.category.GAME") ) {
-					System.out.println("libSDL: Ouya game console detected");
-					Globals.IsOuya = true;
-				}
-			}
-		}
-
 		System.out.println("libSDL: Creating startup screen");
 		_layout = new LinearLayout(this);
 		_layout.setOrientation(LinearLayout.VERTICAL);
diff --git a/project/java/Settings.java b/project/java/Settings.java
index bddf16f40..11e30a543 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -170,7 +170,7 @@ class Settings
 			return;
 		}
 		System.out.println("libSDL: Settings.Load(): enter");
-		nativeInitKeymap(Globals.IsOuya ? 1 : 0);
+		nativeInitKeymap();
 		for( int i = 0; i < SDL_Keys.JAVA_KEYCODE_LAST; i++ )
 		{
 			int sdlKey = nativeGetKeymapKey(i);
@@ -2812,7 +2812,7 @@ class Settings
 	private static native void nativeSetVideoForceSoftwareMode();
 	private static native void nativeSetupScreenKeyboard(int size, int drawsize, int theme, int nbuttonsAutoFire, int transparency);
 	private static native void nativeSetupScreenKeyboardButtons(byte[] img);
-	private static native void nativeInitKeymap(int isOuya);
+	private static native void nativeInitKeymap();
 	private static native int  nativeGetKeymapKey(int key);
 	private static native void nativeSetKeymapKey(int javakey, int key);
 	private static native int  nativeGetKeymapKeyScreenKb(int keynum);
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index ab41d0204..d22b2aac8 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit ab41d0204e5c53e3cdcca2526922b0b66f6bb272
+Subproject commit d22b2aac8b1595e8f7dfd3dcded53f0812bfc032
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
index d169540de..0b8d4851d 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
@@ -2194,7 +2194,7 @@ JAVA_EXPORT_NAME(Settings_nativeSetTouchscreenCalibration) (JNIEnv* env, jobject
 }
 
 JNIEXPORT void JNICALL 
-JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv*  env, jobject thiz, jint isOuya )
+JAVA_EXPORT_NAME(Settings_nativeInitKeymap) ( JNIEnv*  env, jobject thiz )
 {
-	SDL_android_init_keymap(SDL_android_keymap, isOuya);
+	SDL_android_init_keymap(SDL_android_keymap);
 }
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
index 96b33d0cd..59caac53a 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
@@ -200,7 +200,7 @@ extern void SDL_ANDROID_MainThreadPushJoystickAxis(int joy, int axis, int value)
 extern void SDL_ANDROID_MainThreadPushJoystickButton(int joy, int button, int pressed);
 extern void SDL_ANDROID_MainThreadPushJoystickBall(int joy, int ball, int x, int y);
 extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode );
-extern void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya);
+extern void SDL_android_init_keymap(SDLKey *SDL_android_keymap);
 extern void SDL_ANDROID_MainThreadPushMouseWheel( int x, int y ); // SDL 1.3 only
 extern void SDL_ANDROID_MainThreadPushAppActive(int active);
 #endif
diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c
index 0ab147eef..e846e4bf1 100644
--- a/project/jni/sdl-1.2/src/video/android/keymap.c
+++ b/project/jni/sdl-1.2/src/video/android/keymap.c
@@ -4,7 +4,7 @@
 #include "SDL_androidinput.h"
 #include "SDL_screenkeyboard.h"
 
-void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya)
+void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
 {
   int i;
   SDLKey * keymap = SDL_android_keymap;
@@ -131,7 +131,7 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap, int isOuya)
   keymap[KEYCODE_PICTSYMBOLS] = SDL_KEY(LSHIFT);
   keymap[KEYCODE_SWITCH_CHARSET] = SDL_KEY(LSHIFT);
   keymap[KEYCODE_BUTTON_A] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_2));
-  keymap[KEYCODE_BUTTON_B] = isOuya ? SDL_KEY(ESCAPE) : SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3));
+  keymap[KEYCODE_BUTTON_B] = SDL_KEY(ESCAPE); // SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_3)); // There's no Back key on Ouya
   keymap[KEYCODE_BUTTON_C] = SDL_KEY(C);
   keymap[KEYCODE_BUTTON_X] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_0));
   keymap[KEYCODE_BUTTON_Y] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_1));