Remove timeout detection hack