Readjust call-delay to be more backward-compatible