Use the new timeout facility