diff --git a/mode/src/processing/mode/android/AVD.java b/mode/src/processing/mode/android/AVD.java
index dc44867a..dae862ae 100644
--- a/mode/src/processing/mode/android/AVD.java
+++ b/mode/src/processing/mode/android/AVD.java
@@ -101,18 +101,18 @@ static public String getName(boolean wear) {
   
   
   static public String getPreferredPlatform(boolean wear, String abi) {
-//    if (wear) {
-//      return AndroidBuild.TARGET_PLATFORM;
-//    } else if (abi.equals("arm")) {
-//      // The ARM images using Google APIs are too slow, so use the
-//      // older Android (AOSP) images.
-//      return "android-" + TARGET_SDK_ARM;
-//    } else if (abi.equals("arm64-v8a")) {
-//      return AndroidBuild.TARGET_PLATFORM;
-//    } else {
-//      return AndroidBuild.TARGET_PLATFORM;
-//    }
-    return AndroidBuild.TARGET_PLATFORM;
+    if (wear) {
+      return AndroidBuild.TARGET_PLATFORM;
+    } else if (abi.equals("arm")) {
+      // The ARM images using Google APIs are too slow, so use the
+      // older Android (AOSP) images.
+      // TODO check if we can move to the regular ARM images...
+      return "android-" + TARGET_SDK_ARM;
+    } else if (abi.equals("arm64-v8a")) {
+      return AndroidBuild.TARGET_PLATFORM;
+    } else {
+      return AndroidBuild.TARGET_PLATFORM;
+    }
   }
   
   static public String getPreferredPort(boolean wear) {