diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java
index f0b1ffd..5552b1c 100644
--- a/dalvik/src/main/java/dalvik/system/DexPathList.java
+++ b/dalvik/src/main/java/dalvik/system/DexPathList.java
@@ -224,6 +224,15 @@
         return makeElements(files, null, suppressedExceptions, true);
     }
 
+    /*
+     * TODO (dimitry): Revert after GMS core stops relying on the existence of this
+     * method (see b/21957414 for details)
+     */
+    private static Element[] makePathElements(List<File> files, File optimizedDirectory,
+                                              List<IOException> suppressedExceptions) {
+        return makeElements(files, null, suppressedExceptions, true);
+    }
+
     private static Element[] makeElements(List<File> files, File optimizedDirectory,
                                           List<IOException> suppressedExceptions,
                                           boolean ignoreDexFiles) {