Reverts moving waitUntil

Reverts also the logic change