diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk
index aa695eb31c..07e2d196d3 100644
--- a/core/tasks/module-info.mk
+++ b/core/tasks/module-info.mk
@@ -52,6 +52,8 @@ $(MODULE_INFO_JSON): $(SOONG_MODULE_INFO)
 	$(PRIVATE_MERGE_JSON_OBJECTS) -o $@ $(PRIVATE_SOONG_MODULE_INFO) $@.tmp
 	rm $@.tmp
 
+.PHONY: module-info
+module-info: $(MODULE_INFO_JSON)
 
 droidcore-unbundled: $(MODULE_INFO_JSON)
 
diff --git a/envsetup.sh b/envsetup.sh
index dd545c6bed..b20c83fed3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1195,22 +1195,6 @@ function godir () {
     \cd $T/$pathname
 }
 
-function refreshmod() {
-    if [ ! "$ANDROID_PRODUCT_OUT" ]; then
-        echo "No ANDROID_PRODUCT_OUT. Try running 'lunch' first." >&2
-        return 1
-    fi
-
-    echo "Refreshing modules (building module-info.json). Log at $ANDROID_PRODUCT_OUT/module-info.json.build.log." >&2
-
-    # for the output of the next command
-    mkdir -p $ANDROID_PRODUCT_OUT || return 1
-
-    # Note, can't use absolute path because of the way make works.
-    m $(get_build_var PRODUCT_OUT)/module-info.json \
-        > $ANDROID_PRODUCT_OUT/module-info.json.build.log 2>&1
-}
-
 # Verifies that module-info.txt exists, returning nonzero if it doesn't.
 function verifymodinfo() {
     if [ ! "$ANDROID_PRODUCT_OUT" ]; then
@@ -1578,6 +1562,7 @@ unset sgrep
 unset tomlgrep
 unset treegrep
 unset syswrite
+unset refreshmod
 
 
 validate_current_shell