diff --git a/make/Images.gmk b/make/Images.gmk
index 97cce400395..f7650d2efd9 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -41,7 +41,8 @@ $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
 
-$(eval $(call ReadImportMetaData))
+IMPORTED_MODULES := $(call FindImportedModules)
+$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
 
 JRE_MODULES += $(filter-out $(MODULES_FILTER), $(BOOT_MODULES) $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 JDK_MODULES += $(filter-out $(MODULES_FILTER), $(ALL_MODULES))
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index c8da1a20499..a2a7f238d78 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -253,7 +253,7 @@ endef
 # * JRE_TOOL_MODULES
 define ReadImportMetaData
     IMPORTED_MODULES := $(call FindImportedModules)
-    $(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadImportMetaData, $m)))
+    $(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
 endef
 
 ################################################################################