Works with scripts that don't use bootstrap_wait