Fec 1494

@ElizaSapir  where do we remove this timeout?