Re-added the timeout to prevent continuous polling. Taken out by accident.