Fixed bootstrap rollback