This add fix to avoid session specific environement variable to be
leaked into new session.

Also, it will restore the old systemd session variable upon shutting
down.