Rebase sg

Why is this timeout for? If it's related to time.sleep, I'd be happier not having it around