Use the new bootstrap that prevents 2.0 breakage