fixup! Allow the bootstrap to be disabled (to run the tests in a more isolated way)