Update env stub to match changes in 431a4e6