Reverted timeout to 2s