DSP-1479: Make initial delay unconditional

A temporary measure to unblock DSP-1479. All of those ugly hacks will be dropped altogether once 1379 is 'reverted' - there is more to it than just reverting, but nvm.