diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index fea30ca..bde45e8 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -1,16 +1,7 @@
 #!/bin/sh
-export ANSIBLE_NOCOWS=1
-export BLOCKSIZE=K
-export EDITOR=vi
-export ENV="$HOME/.shrc"
-export GOTELEMETRY=off
-export HISTCONTROL=ignorespace:ignoredups
+
+# Start from known core "C" locale. This will get overwritten later.
 export LANG=C
-export PAGER=less
-export PAPERSIZE=a4
-export POWERSHELL_TELEMETRY_OPTOUT=1
-export PYTHONWARNINGS=ignore::UserWarning
-export VIRSH_DEFAULT_CONNECT_URI=qemu:///session
 
 # Set up XDG variables. See:
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -31,13 +22,6 @@ if [ ! -d "$XDG_STATE_HOME" ]  ; then install -d -m 0700 "$XDG_STATE_HOME"  ; fi
 if [ ! -d "$XDG_RUNTIME_DIR" ] ; then install -d -m 0700 "$XDG_RUNTIME_DIR" ; fi
 if [ ! -d "$HOME/.local/bin" ] ; then install -d -m 0700 "$HOME/.local/bin" ; fi
 
-if [ -d /var/acp ] && ! [ -L /var/acp ]
-then
-    export ACP=/var/acp
-else
-    export ACP="$HOME/data"
-fi
-
 # Locale and language.
 ## Clear the existing locale settings and set options I always want.
 export TZ=Europe/London  # Can override this elsewhere if needed.
@@ -50,6 +34,25 @@ then
     . "$XDG_CONFIG_HOME/locale.conf"
 fi
 
+export ANSIBLE_NOCOWS=1
+export BLOCKSIZE=K
+export EDITOR=vi
+export ENV="$HOME/.shrc"
+export GOTELEMETRY=off
+export HISTCONTROL=ignorespace:ignoredups
+export PAGER=less
+export PAPERSIZE=a4
+export POWERSHELL_TELEMETRY_OPTOUT=1
+export PYTHONWARNINGS=ignore::UserWarning
+export VIRSH_DEFAULT_CONNECT_URI=qemu:///session
+
+if [ -d /var/acp ] && ! [ -L /var/acp ]
+then
+    export ACP=/var/acp
+else
+    export ACP="$HOME/data"
+fi
+
 # Desktop files (used by desktop environments within both X11 and Wayland) are
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
 # snappy applications' desktop files.