We no longer have an overload of Stop that only takes a timeout. I think this is a breaking API change we should care about avoiding.