Again tried to fix the timers so that ES catches up and travis doesn't
timeout