Back to normal bootstrap for now