[WIP] Reverted timeout process