Make retryWhen the same with the Scheduler as the retryWhen without the Scheduler

came up in #1580