Use timed-out package to get timeouts right