Prevent waiting for confirms unless selected
merge bug25356 into default