Changed default timeout from 5000 to 500ms