Bug 844630 - Be explicit about environ visibility. r=bgirard