diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 0daac61e01..0b7b8d45b8 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -289,11 +289,6 @@ exec_command(const char *cmd,
 			success = false;
 		}
 
-		if (pset.dirname)
-			free(pset.dirname);
-		pset.dirname = pg_strdup(dir);
-		canonicalize_path(pset.dirname);
-
 		if (opt)
 			free(opt);
 	}
@@ -1102,8 +1097,7 @@ exec_command(const char *cmd,
 		/* This scrolls off the screen when using /dev/tty */
 		success = saveHistory(fname ? fname : DEVTTY, -1, false, false);
 		if (success && !pset.quiet && fname)
-			printf(gettext("Wrote history to file \"%s/%s\".\n"),
-				   pset.dirname ? pset.dirname : ".", fname);
+			printf(_("Wrote history to file \"%s\".\n"), fname);
 		if (!fname)
 			putchar('\n');
 		free(fname);
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index e78aa9a499..36a7a469cd 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -84,8 +84,6 @@ typedef struct _psqlSettings
 	int			sversion;		/* backend server version */
 	const char *progname;		/* in case you renamed psql */
 	char	   *inputfile;		/* file being currently processed, if any */
-	char	   *dirname;		/* current directory for \s display */
-
 	uint64		lineno;			/* also for error reporting */
 
 	bool		timing;			/* enable timing of all queries */