Can you make the timeouts configurable too?
We should preserve the original timeouts (which I believe are -1 for both?)