OT to this patch, but this 5 second timeout seems really fragile. A long gc could trigger it, but beyond that if removing this binding triggers a cascading series of dependent service stops, that could end up taking 5 secs. Particularly when we add in graceful shutdown behavior.