Remove separate timeout field

This simplifies the API a bit from the client's perspective.