5135a422f1
FreeBSD]. We really didn't need the environment fixes, but for the sake of keeping the code as close as possible...