Remove /etc/environment workaround