Merge "Revert "Deoptimization-based bce.""