=== modified file 'data/unity8.conf'
--- data/unity8.conf	2015-08-28 07:11:32 +0000
+++ data/unity8.conf	2015-09-01 11:20:33 +0000
@@ -16,11 +16,9 @@
     initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
 
     if [ -n "$MIR_SOCKET" ]; then
-        if [ -z "$UNITY_MIR_SOCKET" ]; then
-            # Save original value of MIR_SOCKET in case we are restarted,
-            # as we modify the variable for future jobs, including ourself.
-            UNITY_MIR_SOCKET=$MIR_SOCKET
-        fi
+        # Save original value of MIR_SOCKET in case we are stopped,
+        # as we modify the variable for future jobs, including ourself.
+        UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SOCKET)
         initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET
 
         # Point unity8 at unity-system-compositor