Avoid env vars that are too long

See bug 644