(#3209) - Switch bail default back to true