Temporarily restore cf-env until dependents move off