diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
index 98eadcacb..272f36e4f 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
@@ -290,16 +290,12 @@ final class BinaryDictionaryGetter {
             final Context context) {
 
         final boolean hasDefaultWordList = DictionaryFactory.isDictionaryAvailable(context, locale);
-        // TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
-        // Service yet
-        if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
-            // We need internet access to do the following. Only do this if the package actually
-            // has the permission.
-            if (context.checkCallingOrSelfPermission(android.Manifest.permission.INTERNET)
-                    == PackageManager.PERMISSION_GRANTED) {
-                BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
-                        hasDefaultWordList);
-            }
+        // We need internet access to do the following. Only do this if the package actually
+        // has the permission.
+        if (context.checkCallingOrSelfPermission(android.Manifest.permission.INTERNET)
+                == PackageManager.PERMISSION_GRANTED) {
+            BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
+                    hasDefaultWordList);
         }
         final File[] cachedWordLists = getCachedWordLists(locale.toString(), context);
         final String mainDictId = DictionaryInfoUtils.getMainDictId(locale);
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 0bf167fd4..9ae2a8a78 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -179,11 +179,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     private int mDisplayOrientation;
 
     // Object for reacting to adding/removing a dictionary pack.
-    // TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
-    // Service yet.
     private BroadcastReceiver mDictionaryPackInstallReceiver =
-            ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS
-                    ? null : new DictionaryPackInstallBroadcastReceiver(this);
+            new DictionaryPackInstallBroadcastReceiver(this);
 
     // Keeps track of most recently inserted text (multi-character key) for reverting
     private String mEnteredText;
@@ -458,19 +455,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
         registerReceiver(mReceiver, filter);
 
-        // TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
-        // Service yet.
-        if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
-            final IntentFilter packageFilter = new IntentFilter();
-            packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
-            packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
-            packageFilter.addDataScheme(SCHEME_PACKAGE);
-            registerReceiver(mDictionaryPackInstallReceiver, packageFilter);
+        final IntentFilter packageFilter = new IntentFilter();
+        packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        packageFilter.addDataScheme(SCHEME_PACKAGE);
+        registerReceiver(mDictionaryPackInstallReceiver, packageFilter);
 
-            final IntentFilter newDictFilter = new IntentFilter();
-            newDictFilter.addAction(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION);
-            registerReceiver(mDictionaryPackInstallReceiver, newDictFilter);
-        }
+        final IntentFilter newDictFilter = new IntentFilter();
+        newDictFilter.addAction(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION);
+        registerReceiver(mDictionaryPackInstallReceiver, newDictFilter);
     }
 
     // Has to be package-visible for unit tests
@@ -587,11 +580,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
             ResearchLogger.getInstance().onDestroy();
         }
-        // TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
-        // Service yet.
-        if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
-            unregisterReceiver(mDictionaryPackInstallReceiver);
-        }
+        unregisterReceiver(mDictionaryPackInstallReceiver);
         LatinImeLogger.commit();
         LatinImeLogger.onDestroy();
         super.onDestroy();
diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java
index 2d4de15d7..1fad765d7 100644
--- a/java/src/com/android/inputmethod/latin/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java
@@ -202,9 +202,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
         final Intent intent = dictionaryLink.getIntent();
         intent.setClassName(context.getPackageName(), DictionarySettingsActivity.class.getName());
         final int number = context.getPackageManager().queryIntentActivities(intent, 0).size();
-        // TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
-        // Service yet
-        if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS || 0 >= number) {
+        if (0 >= number) {
             textCorrectionGroup.removePreference(dictionaryLink);
         }