Avoid checking for isbootstrap