(#XXX) - Switch bail default back to true