Fixes #2441

Defaults to 0 (no delay) for backward compat and because this feature
should be opt-in.