Do not bundle env check on same issue, reverting