diff --git a/java/Android.mk b/java/Android.mk
index 97c906f2617bd6b978de6d7ad780ee85cdbb9ee2..9b2e47da41e143b012c8e6a7e010d1700596a609 100755
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -15,7 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
 
 #LOCAL_AAPT_FLAGS := -0 .dict
 # The following flag is required because we use a different package name
-# com.google.android.inputmethod.latin2 in the LatinIME sandbox.
+# com.google.android.inputmethod.latin in the LatinIME sandbox.
 LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin
 
 LOCAL_SDK_VERSION := current
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 5f4791d1feb42cf98c77988141fafb46e60294b9..f87ce013b1a08166a527f568c20d8dfc4410c488 100755
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.google.android.inputmethod.latin">
 
-    <!-- Do not override the default LatinIME for now -->
-    <!-- original-package android:name="com.android.inputmethod.latin" / -->
+    <original-package android:name="com.android.inputmethod.latin" />
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />