bootstrap: minor change to support modularizing bootstrap_helper