2 files changed, 4 insertions, 9 deletions

diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 965ea25ac900..7b379105714c 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -1737,9 +1737,7 @@ WARNINGS=$WORKDIR/warnings
 EDITOR=${EDITOR:-/usr/bin/vi}
 
 # Files that need to be updated before installworld.
-PREWORLD_FILES="lib/libc/gen/master.passwd lib/libc/gen/group"
-# If on an older tree, use it instead.  Delete after 13.0.
-[ -f ${SRCDIR}/etc/master.passwd ] && PREWORLD_FILES="etc/master.passwd etc/group"
+PREWORLD_FILES="etc/master.passwd etc/group"
 
 # Handle command-specific argument processing such as complaining
 # about unsupported options.  Since the configuration file is always
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 9a92a13a947e..b6106f60bff2 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -669,12 +669,9 @@ case "${RERUN}" in
     ;;
   *)
     # Only set up files that are crucial to {build|install}world
-    { MM_PASSDIR="${SOURCEDIR}/lib/libc/gen"
-      # If on an older tree, use it instead.  Delete after 13.0.
-      [ -f ${SOURCEDIR}/etc/master.passwd ] && MM_PASSDIR="${SOURCEDIR}/etc"
-      mkdir -p ${TEMPROOT}/etc &&
-      cp -p ${MM_PASSDIR}/master.passwd ${TEMPROOT}/etc &&
-      install -p -o root -g wheel -m 0644 ${MM_PASSDIR}/group ${TEMPROOT}/etc;} ||
+    { mkdir -p ${TEMPROOT}/etc &&
+      cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc &&
+      install -p -o root -g wheel -m 0644 ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} ||
     { echo '';
       echo '  *** FATAL ERROR: Cannot copy files to the temproot environment';
       echo '';