Merge "Revert "Fix 616-cha assumptions.""