CA-105155: Make sure we really timeout as requested

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>