Remove environment dependency, roll forward again.